Cycles: Use explicit qualifier for single-argument constructors
Almost in all cases we want such constructors to be explicit, there are exceptions but only in few places.
This commit is contained in:
parent
d57f416e47
commit
92774ff792
|
@ -75,7 +75,7 @@ public:
|
|||
m_visibility = 0; /* happens on build cancel */
|
||||
}
|
||||
|
||||
InnerNode(const BoundBox& bounds)
|
||||
explicit InnerNode(const BoundBox& bounds)
|
||||
{
|
||||
m_bounds = bounds;
|
||||
m_visibility = 0;
|
||||
|
|
|
@ -40,7 +40,7 @@ struct BVHReferenceCompare {
|
|||
public:
|
||||
int dim;
|
||||
|
||||
BVHReferenceCompare(int dim_)
|
||||
explicit BVHReferenceCompare(int dim_)
|
||||
{
|
||||
dim = dim_;
|
||||
}
|
||||
|
@ -184,7 +184,7 @@ void bvh_reference_sort(int start, int end, BVHReference *data, int dim)
|
|||
}
|
||||
else {
|
||||
TaskPool task_pool;
|
||||
bvh_reference_sort_threaded(&task_pool, data, start, end - 1, dim);
|
||||
bvh_reference_sort_threaded(&task_pool, data, start, end - 1, compare);
|
||||
task_pool.wait_work();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -35,7 +35,7 @@ class MultiDevice : public Device
|
|||
{
|
||||
public:
|
||||
struct SubDevice {
|
||||
SubDevice(Device *device_)
|
||||
explicit SubDevice(Device *device_)
|
||||
: device(device_) {}
|
||||
|
||||
Device *device;
|
||||
|
|
|
@ -322,7 +322,7 @@ protected:
|
|||
|
||||
class ServerDiscovery {
|
||||
public:
|
||||
ServerDiscovery(bool discover = false)
|
||||
explicit ServerDiscovery(bool discover = false)
|
||||
: listen_socket(io_service), collect_servers(false)
|
||||
{
|
||||
/* setup listen socket */
|
||||
|
|
|
@ -51,7 +51,7 @@ public:
|
|||
int shader_filter;
|
||||
int shader_x, shader_w;
|
||||
|
||||
DeviceTask(Type type = PATH_TRACE);
|
||||
explicit DeviceTask(Type type = PATH_TRACE);
|
||||
|
||||
int get_subtask_count(int num, int max_size = 0);
|
||||
void split(list<DeviceTask>& tasks, int num, int max_size = 0);
|
||||
|
|
|
@ -134,8 +134,8 @@ public:
|
|||
AttributeElement triangle_element, curve_element;
|
||||
int triangle_offset, curve_offset;
|
||||
|
||||
AttributeRequest(ustring name_);
|
||||
AttributeRequest(AttributeStandard std);
|
||||
explicit AttributeRequest(ustring name_);
|
||||
explicit AttributeRequest(AttributeStandard std);
|
||||
};
|
||||
|
||||
/* AttributeRequestSet
|
||||
|
|
|
@ -73,7 +73,7 @@ public:
|
|||
/* random number generator state */
|
||||
device_vector<uint> rng_state;
|
||||
|
||||
RenderBuffers(Device *device);
|
||||
explicit RenderBuffers(Device *device);
|
||||
~RenderBuffers();
|
||||
|
||||
void reset(Device *device, BufferParams& params);
|
||||
|
|
|
@ -177,7 +177,7 @@ public:
|
|||
|
||||
class ShaderNode {
|
||||
public:
|
||||
ShaderNode(const char *name);
|
||||
explicit ShaderNode(const char *name);
|
||||
virtual ~ShaderNode();
|
||||
|
||||
ShaderInput *input(const char *name);
|
||||
|
|
|
@ -32,7 +32,7 @@ class Progress;
|
|||
|
||||
class ImageManager {
|
||||
public:
|
||||
ImageManager(const DeviceInfo& info);
|
||||
explicit ImageManager(const DeviceInfo& info);
|
||||
~ImageManager();
|
||||
|
||||
enum ImageDataType {
|
||||
|
|
|
@ -75,7 +75,7 @@ public:
|
|||
|
||||
class TextureNode : public ShaderNode {
|
||||
public:
|
||||
TextureNode(const char *name_) : ShaderNode(name_) {}
|
||||
explicit TextureNode(const char *name_) : ShaderNode(name_) {}
|
||||
TextureMapping tex_mapping;
|
||||
|
||||
virtual bool equals(const ShaderNode *other) {
|
||||
|
@ -87,7 +87,7 @@ public:
|
|||
/* Any node which uses image manager's slot should be a subclass of this one. */
|
||||
class ImageSlotTextureNode : public TextureNode {
|
||||
public:
|
||||
ImageSlotTextureNode(const char *name_) : TextureNode(name_) {
|
||||
explicit ImageSlotTextureNode(const char *name_) : TextureNode(name_) {
|
||||
special_type = SHADER_SPECIAL_TYPE_IMAGE_SLOT;
|
||||
}
|
||||
int slot;
|
||||
|
@ -379,7 +379,7 @@ public:
|
|||
|
||||
class BsdfNode : public ShaderNode {
|
||||
public:
|
||||
BsdfNode(bool scattering = false);
|
||||
explicit BsdfNode(bool scattering = false);
|
||||
SHADER_NODE_BASE_CLASS(BsdfNode);
|
||||
|
||||
bool has_spatial_varying() { return true; }
|
||||
|
|
|
@ -129,7 +129,7 @@ public:
|
|||
function<void(RenderTile&)> write_render_tile_cb;
|
||||
function<void(RenderTile&)> update_render_tile_cb;
|
||||
|
||||
Session(const SessionParams& params);
|
||||
explicit Session(const SessionParams& params);
|
||||
~Session();
|
||||
|
||||
void start();
|
||||
|
|
|
@ -150,7 +150,7 @@ protected:
|
|||
|
||||
/* Global state of the compiler accessible from the compilation routines. */
|
||||
struct CompilerState {
|
||||
CompilerState(ShaderGraph *graph);
|
||||
explicit CompilerState(ShaderGraph *graph);
|
||||
|
||||
/* ** Global state, used by various compilation steps. ** */
|
||||
|
||||
|
|
|
@ -70,7 +70,7 @@ public:
|
|||
size_t vert_offset;
|
||||
size_t tri_offset;
|
||||
|
||||
EdgeDice(const SubdParams& params);
|
||||
explicit EdgeDice(const SubdParams& params);
|
||||
|
||||
void reserve(int num_verts, int num_tris);
|
||||
|
||||
|
@ -111,7 +111,7 @@ public:
|
|||
int tv1;
|
||||
};
|
||||
|
||||
QuadDice(const SubdParams& params);
|
||||
explicit QuadDice(const SubdParams& params);
|
||||
|
||||
void reserve(EdgeFactors& ef, int Mu, int Mv);
|
||||
float3 eval_projected(SubPatch& sub, float u, float v);
|
||||
|
@ -165,7 +165,7 @@ public:
|
|||
int tw;
|
||||
};
|
||||
|
||||
TriangleDice(const SubdParams& params);
|
||||
explicit TriangleDice(const SubdParams& params);
|
||||
|
||||
void reserve(EdgeFactors& ef, int M);
|
||||
|
||||
|
|
|
@ -291,7 +291,7 @@ public:
|
|||
int id;
|
||||
float3 co;
|
||||
|
||||
SubdVert(int id_)
|
||||
explicit SubdVert(int id_)
|
||||
{
|
||||
id = id_;
|
||||
co = make_float3(0.0f, 0.0f, 0.0f);
|
||||
|
@ -307,7 +307,7 @@ public:
|
|||
int numverts;
|
||||
int verts[4];
|
||||
|
||||
SubdFace(int id_)
|
||||
explicit SubdFace(int id_)
|
||||
{
|
||||
id = id_;
|
||||
numverts = 0;
|
||||
|
|
|
@ -43,7 +43,7 @@ public:
|
|||
|
||||
SubdParams params;
|
||||
|
||||
DiagSplit(const SubdParams& params);
|
||||
explicit DiagSplit(const SubdParams& params);
|
||||
|
||||
float3 to_world(Patch *patch, float2 uv);
|
||||
int T(Patch *patch, float2 Pstart, float2 Pend);
|
||||
|
|
|
@ -130,11 +130,11 @@ private:
|
|||
|
||||
#if (__cplusplus > 199711L)
|
||||
public:
|
||||
DebugFlags(DebugFlags const& /*other*/) = delete;
|
||||
explicit DebugFlags(DebugFlags const& /*other*/) = delete;
|
||||
void operator=(DebugFlags const& /*other*/) = delete;
|
||||
#else
|
||||
private:
|
||||
DebugFlags(DebugFlags const& /*other*/);
|
||||
explicit DebugFlags(DebugFlags const& /*other*/);
|
||||
void operator=(DebugFlags const& /*other*/);
|
||||
#endif
|
||||
};
|
||||
|
|
|
@ -92,7 +92,7 @@ public:
|
|||
{
|
||||
}
|
||||
|
||||
directory_iterator(const string& path)
|
||||
explicit directory_iterator(const string& path)
|
||||
: path_(path),
|
||||
path_info_(path, find_data_)
|
||||
{
|
||||
|
@ -176,7 +176,7 @@ class directory_iterator {
|
|||
public:
|
||||
class path_info {
|
||||
public:
|
||||
path_info(const string& path)
|
||||
explicit path_info(const string& path)
|
||||
: path_(path),
|
||||
entry_(NULL)
|
||||
{
|
||||
|
@ -203,7 +203,7 @@ public:
|
|||
{
|
||||
}
|
||||
|
||||
directory_iterator(const string& path)
|
||||
explicit directory_iterator(const string& path)
|
||||
: path_(path),
|
||||
path_info_(path_),
|
||||
cur_entry_(0)
|
||||
|
|
|
@ -52,7 +52,7 @@ class Task
|
|||
{
|
||||
public:
|
||||
Task() {};
|
||||
Task(const TaskRunFunction& run_) : run(run_) {}
|
||||
explicit Task(const TaskRunFunction& run_) : run(run_) {}
|
||||
|
||||
virtual ~Task() {}
|
||||
|
||||
|
|
|
@ -29,7 +29,7 @@ void time_sleep(double t);
|
|||
|
||||
class scoped_timer {
|
||||
public:
|
||||
scoped_timer(double *value) : value_(value)
|
||||
explicit scoped_timer(double *value) : value_(value)
|
||||
{
|
||||
time_start_ = time_dt();
|
||||
}
|
||||
|
|
|
@ -98,7 +98,7 @@ public:
|
|||
capacity_(0)
|
||||
{}
|
||||
|
||||
array(size_t newsize)
|
||||
explicit array(size_t newsize)
|
||||
{
|
||||
if(newsize == 0) {
|
||||
data_ = NULL;
|
||||
|
|
Loading…
Reference in New Issue