diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-04-17 01:51:29 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-04-17 02:05:50 +0300 |
commit | 1dfbcd88d5f64094062b0856539d894da0768478 (patch) | |
tree | 3dc3d84b8f2af887409740fb451a2f96ee37b61b /intern | |
parent | 667a5ef48e5a0f9f20aecce06131516bb92d0f9b (diff) |
Fix a few compiler warnings with OS X / clang.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/kernel/kernel_compat_cpu.h | 6 | ||||
-rw-r--r-- | intern/moto/include/MT_Vector3.h | 1 | ||||
-rw-r--r-- | intern/moto/include/MT_Vector4.h | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernel_compat_cpu.h b/intern/cycles/kernel/kernel_compat_cpu.h index df7d39532aa..b96a84499b4 100644 --- a/intern/cycles/kernel/kernel_compat_cpu.h +++ b/intern/cycles/kernel/kernel_compat_cpu.h @@ -154,6 +154,7 @@ template<typename T> struct texture_image { break; default: kernel_assert(0); + return make_float4(0.0f, 0.0f, 0.0f, 0.0f); } return read(data[ix + iy*width]); } @@ -183,6 +184,7 @@ template<typename T> struct texture_image { break; default: kernel_assert(0); + return make_float4(0.0f, 0.0f, 0.0f, 0.0f); } float4 r = (1.0f - ty)*(1.0f - tx)*read(data[ix + iy*width]); @@ -231,6 +233,7 @@ template<typename T> struct texture_image { break; default: kernel_assert(0); + return make_float4(0.0f, 0.0f, 0.0f, 0.0f); } const int xc[4] = {pix, ix, nix, nnix}; @@ -298,6 +301,7 @@ template<typename T> struct texture_image { break; default: kernel_assert(0); + return make_float4(0.0f, 0.0f, 0.0f, 0.0f); } return read(data[ix + iy*width + iz*width*height]); @@ -335,6 +339,7 @@ template<typename T> struct texture_image { break; default: kernel_assert(0); + return make_float4(0.0f, 0.0f, 0.0f, 0.0f); } float4 r; @@ -402,6 +407,7 @@ template<typename T> struct texture_image { break; default: kernel_assert(0); + return make_float4(0.0f, 0.0f, 0.0f, 0.0f); } const int xc[4] = {pix, ix, nix, nnix}; diff --git a/intern/moto/include/MT_Vector3.h b/intern/moto/include/MT_Vector3.h index b06f345bdaf..545ca1fad0b 100644 --- a/intern/moto/include/MT_Vector3.h +++ b/intern/moto/include/MT_Vector3.h @@ -52,7 +52,6 @@ class MT_Vector3 : public MT_Tuple3 { public: - virtual ~MT_Vector3() {} MT_Vector3() {} MT_Vector3(const float *v) : MT_Tuple3(v) {} MT_Vector3(const double *v) : MT_Tuple3(v) {} diff --git a/intern/moto/include/MT_Vector4.h b/intern/moto/include/MT_Vector4.h index d157cefa946..440bf9b84f1 100644 --- a/intern/moto/include/MT_Vector4.h +++ b/intern/moto/include/MT_Vector4.h @@ -53,7 +53,6 @@ class MT_Vector4 : public MT_Tuple4 { public: - virtual ~MT_Vector4() {} MT_Vector4() {} MT_Vector4(const float *v) : MT_Tuple4(v) {} MT_Vector4(const double *v) : MT_Tuple4(v) {} |