Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-05-11 17:50:10 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-05-11 17:51:14 +0300
commit92774ff792a6c474df2a40c13204da4975de0c09 (patch)
tree3c709f8f3126449bcc2c50ae51f89442d01e34d0 /intern/cycles/render
parentd57f416e47f54241dea0892f3b064afbe1b8a899 (diff)
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.
Diffstat (limited to 'intern/cycles/render')
-rw-r--r--intern/cycles/render/attribute.h4
-rw-r--r--intern/cycles/render/buffers.h2
-rw-r--r--intern/cycles/render/graph.h2
-rw-r--r--intern/cycles/render/image.h2
-rw-r--r--intern/cycles/render/nodes.h6
-rw-r--r--intern/cycles/render/session.h2
-rw-r--r--intern/cycles/render/svm.h2
7 files changed, 10 insertions, 10 deletions
diff --git a/intern/cycles/render/attribute.h b/intern/cycles/render/attribute.h
index bbc6cf7f65f..01102d22aaa 100644
--- a/intern/cycles/render/attribute.h
+++ b/intern/cycles/render/attribute.h
@@ -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
diff --git a/intern/cycles/render/buffers.h b/intern/cycles/render/buffers.h
index 4fa1c51d821..57ffd9630f5 100644
--- a/intern/cycles/render/buffers.h
+++ b/intern/cycles/render/buffers.h
@@ -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);
diff --git a/intern/cycles/render/graph.h b/intern/cycles/render/graph.h
index 6619fcaebeb..b1ebdbfd51d 100644
--- a/intern/cycles/render/graph.h
+++ b/intern/cycles/render/graph.h
@@ -177,7 +177,7 @@ public:
class ShaderNode {
public:
- ShaderNode(const char *name);
+ explicit ShaderNode(const char *name);
virtual ~ShaderNode();
ShaderInput *input(const char *name);
diff --git a/intern/cycles/render/image.h b/intern/cycles/render/image.h
index 1bb9987f602..02dc189b5ec 100644
--- a/intern/cycles/render/image.h
+++ b/intern/cycles/render/image.h
@@ -32,7 +32,7 @@ class Progress;
class ImageManager {
public:
- ImageManager(const DeviceInfo& info);
+ explicit ImageManager(const DeviceInfo& info);
~ImageManager();
enum ImageDataType {
diff --git a/intern/cycles/render/nodes.h b/intern/cycles/render/nodes.h
index 7ae37a633ca..ccfea033c12 100644
--- a/intern/cycles/render/nodes.h
+++ b/intern/cycles/render/nodes.h
@@ -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; }
diff --git a/intern/cycles/render/session.h b/intern/cycles/render/session.h
index 02d97ce9a87..8bff0f9ed15 100644
--- a/intern/cycles/render/session.h
+++ b/intern/cycles/render/session.h
@@ -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();
diff --git a/intern/cycles/render/svm.h b/intern/cycles/render/svm.h
index f4777dee89d..5ff98ac6e91 100644
--- a/intern/cycles/render/svm.h
+++ b/intern/cycles/render/svm.h
@@ -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. ** */