Fix compilation error with clang-5

2017-11-14 17:00:54 +01:00
parent 6f15554af3
commit 2868dcbe2b
4 changed files with 4 additions and 4 deletions
--- a/intern/eigen/intern/eigenvalues.cc
+++ b/intern/eigen/intern/eigenvalues.cc
@@ -28,7 +28,7 @@
 #define __EIGEN3_EIGENVALUES_C_API_CC__

 /* Eigen gives annoying huge amount of warnings here, silence them! */
-#ifdef __GNUC__
+#if defined(__GNUC__) && !defined(__clang__)
 #  pragma GCC diagnostic ignored "-Wlogical-op"
 #endif

--- a/intern/eigen/intern/svd.cc
+++ b/intern/eigen/intern/svd.cc
@@ -28,7 +28,7 @@
 #define __EIGEN3_SVD_C_API_CC__

 /* Eigen gives annoying huge amount of warnings here, silence them! */
-#ifdef __GNUC__
+#if defined(__GNUC__) && !defined(__clang__)
 #  pragma GCC diagnostic ignored "-Wlogical-op"
 #endif

--- a/source/blender/physics/intern/eigen_utils.h
+++ b/source/blender/physics/intern/eigen_utils.h
@@ -32,7 +32,7 @@
 *  \ingroup bph
 */

-#ifdef __GNUC__
+#if defined(__GNUC__) && !defined(__clang__)
 #  pragma GCC diagnostic push
 /* XXX suppress verbose warnings in eigen */
 #  pragma GCC diagnostic ignored "-Wlogical-op"
--- a/source/blender/physics/intern/implicit_eigen.cpp
+++ b/source/blender/physics/intern/implicit_eigen.cpp
@@ -39,7 +39,7 @@
 #ifdef __GNUC__
 #  pragma GCC diagnostic push
 /* XXX suppress verbose warnings in eigen */
-#  pragma GCC diagnostic ignored "-Wlogical-op"
+//#  pragma GCC diagnostic ignored "-Wlogical-op"
 #endif

 #ifndef IMPLICIT_ENABLE_EIGEN_DEBUG