diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-03-06 16:16:45 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-03-06 16:18:26 +0300 |
commit | 0e995e0bfe51614e1a3ed75e8e80fa194a38d4aa (patch) | |
tree | edf003f651e017f1e63015c925286469c45b8c02 /intern/cycles | |
parent | b498db06eb43f1e036f16cb346bf4cbb6d20e6d5 (diff) |
Cycles: Fix strict -Wpedantic warnings with GCC
Patch by Stefan Werner, thanks!
Diffstat (limited to 'intern/cycles')
-rw-r--r-- | intern/cycles/render/background.h | 2 | ||||
-rw-r--r-- | intern/cycles/render/camera.h | 2 | ||||
-rw-r--r-- | intern/cycles/render/film.h | 2 | ||||
-rw-r--r-- | intern/cycles/render/graph.h | 4 | ||||
-rw-r--r-- | intern/cycles/render/integrator.h | 2 | ||||
-rw-r--r-- | intern/cycles/render/mesh.h | 2 | ||||
-rw-r--r-- | intern/cycles/render/object.h | 2 | ||||
-rw-r--r-- | intern/cycles/render/shader.h | 2 | ||||
-rw-r--r-- | intern/cycles/util/util_ssef.h | 8 |
9 files changed, 13 insertions, 13 deletions
diff --git a/intern/cycles/render/background.h b/intern/cycles/render/background.h index 8029c6a9e80..deb22c9c2f2 100644 --- a/intern/cycles/render/background.h +++ b/intern/cycles/render/background.h @@ -30,7 +30,7 @@ class Shader; class Background : public Node { public: - NODE_DECLARE; + NODE_DECLARE float ao_factor; float ao_distance; diff --git a/intern/cycles/render/camera.h b/intern/cycles/render/camera.h index 141ef9cccef..655d74e42d8 100644 --- a/intern/cycles/render/camera.h +++ b/intern/cycles/render/camera.h @@ -39,7 +39,7 @@ class Scene; class Camera : public Node { public: - NODE_DECLARE; + NODE_DECLARE /* Specifies an offset for the shutter's time interval. */ enum MotionPosition { diff --git a/intern/cycles/render/film.h b/intern/cycles/render/film.h index 9fa51c51f52..d917057ed91 100644 --- a/intern/cycles/render/film.h +++ b/intern/cycles/render/film.h @@ -53,7 +53,7 @@ public: class Film : public Node { public: - NODE_DECLARE; + NODE_DECLARE float exposure; array<Pass> passes; diff --git a/intern/cycles/render/graph.h b/intern/cycles/render/graph.h index 780fdf49ca4..06524d3fa13 100644 --- a/intern/cycles/render/graph.h +++ b/intern/cycles/render/graph.h @@ -201,14 +201,14 @@ public: /* Node definition utility macros */ #define SHADER_NODE_CLASS(type) \ - NODE_DECLARE; \ + NODE_DECLARE \ type(); \ virtual ShaderNode *clone() const { return new type(*this); } \ virtual void compile(SVMCompiler& compiler); \ virtual void compile(OSLCompiler& compiler); \ #define SHADER_NODE_NO_CLONE_CLASS(type) \ - NODE_DECLARE; \ + NODE_DECLARE \ type(); \ virtual void compile(SVMCompiler& compiler); \ virtual void compile(OSLCompiler& compiler); \ diff --git a/intern/cycles/render/integrator.h b/intern/cycles/render/integrator.h index 27fff4831e5..3ce41d5a185 100644 --- a/intern/cycles/render/integrator.h +++ b/intern/cycles/render/integrator.h @@ -29,7 +29,7 @@ class Scene; class Integrator : public Node { public: - NODE_DECLARE; + NODE_DECLARE int min_bounce; int max_bounce; diff --git a/intern/cycles/render/mesh.h b/intern/cycles/render/mesh.h index 5f33e30eac2..1f8b880c161 100644 --- a/intern/cycles/render/mesh.h +++ b/intern/cycles/render/mesh.h @@ -48,7 +48,7 @@ struct PackedPatchTable; class Mesh : public Node { public: - NODE_DECLARE; + NODE_DECLARE /* Mesh Triangle */ struct Triangle { diff --git a/intern/cycles/render/object.h b/intern/cycles/render/object.h index 7e306fab2a8..3495849d149 100644 --- a/intern/cycles/render/object.h +++ b/intern/cycles/render/object.h @@ -40,7 +40,7 @@ struct Transform; class Object : public Node { public: - NODE_DECLARE; + NODE_DECLARE Mesh *mesh; Transform tfm; diff --git a/intern/cycles/render/shader.h b/intern/cycles/render/shader.h index 7d896652196..490c3f1c95d 100644 --- a/intern/cycles/render/shader.h +++ b/intern/cycles/render/shader.h @@ -82,7 +82,7 @@ enum DisplacementMethod { class Shader : public Node { public: - NODE_DECLARE; + NODE_DECLARE int pass_id; diff --git a/intern/cycles/util/util_ssef.h b/intern/cycles/util/util_ssef.h index 2f5295b5463..cf99a08efae 100644 --- a/intern/cycles/util/util_ssef.h +++ b/intern/cycles/util/util_ssef.h @@ -514,12 +514,12 @@ ccl_device_inline float len3(const ssef& a) /* faster version for SSSE3 */ typedef ssei shuffle_swap_t; -ccl_device_inline const shuffle_swap_t shuffle_swap_identity(void) +ccl_device_inline shuffle_swap_t shuffle_swap_identity(void) { return _mm_set_epi8(15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0); } -ccl_device_inline const shuffle_swap_t shuffle_swap_swap(void) +ccl_device_inline shuffle_swap_t shuffle_swap_swap(void) { return _mm_set_epi8(7, 6, 5, 4, 3, 2, 1, 0, 15, 14, 13, 12, 11, 10, 9, 8); } @@ -534,12 +534,12 @@ ccl_device_inline const ssef shuffle_swap(const ssef& a, const shuffle_swap_t& s /* somewhat slower version for SSE2 */ typedef int shuffle_swap_t; -ccl_device_inline const shuffle_swap_t shuffle_swap_identity(void) +ccl_device_inline shuffle_swap_t shuffle_swap_identity(void) { return 0; } -ccl_device_inline const shuffle_swap_t shuffle_swap_swap(void) +ccl_device_inline shuffle_swap_t shuffle_swap_swap(void) { return 1; } |