diff options
| -rw-r--r-- | intern/eigen/intern/eigenvalues.cc | 2 | ||||
| -rw-r--r-- | intern/eigen/intern/svd.cc | 2 | ||||
| -rw-r--r-- | source/blender/physics/intern/eigen_utils.h | 2 | ||||
| -rw-r--r-- | source/blender/physics/intern/implicit_eigen.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/intern/eigen/intern/eigenvalues.cc b/intern/eigen/intern/eigenvalues.cc index 57942a4dc55..b516443c421 100644 --- 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 diff --git a/intern/eigen/intern/svd.cc b/intern/eigen/intern/svd.cc index 04929cff798..7c331d25aa7 100644 --- 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 diff --git a/source/blender/physics/intern/eigen_utils.h b/source/blender/physics/intern/eigen_utils.h index e4a4f306aeb..8a5a9dbf5e9 100644 --- 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" diff --git a/source/blender/physics/intern/implicit_eigen.cpp b/source/blender/physics/intern/implicit_eigen.cpp index ff4c705ed61..afe1b441632 100644 --- 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 |