From 92774ff792a6c474df2a40c13204da4975de0c09 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 11 May 2016 16:50:10 +0200 Subject: 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. --- intern/cycles/subd/subd_dice.h | 6 +++--- intern/cycles/subd/subd_mesh.cpp | 4 ++-- intern/cycles/subd/subd_split.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'intern/cycles/subd') diff --git a/intern/cycles/subd/subd_dice.h b/intern/cycles/subd/subd_dice.h index 8450a43129e..49f786e949e 100644 --- a/intern/cycles/subd/subd_dice.h +++ b/intern/cycles/subd/subd_dice.h @@ -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); diff --git a/intern/cycles/subd/subd_mesh.cpp b/intern/cycles/subd/subd_mesh.cpp index d7cb7b921ee..56d7d2b2303 100644 --- a/intern/cycles/subd/subd_mesh.cpp +++ b/intern/cycles/subd/subd_mesh.cpp @@ -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; diff --git a/intern/cycles/subd/subd_split.h b/intern/cycles/subd/subd_split.h index f04c51dedfe..bbe921f739c 100644 --- a/intern/cycles/subd/subd_split.h +++ b/intern/cycles/subd/subd_split.h @@ -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); -- cgit v1.2.3