diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-14 19:00:54 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-14 19:11:48 +0300 |
| commit | 2868dcbe2bc4eb64e2667239aed7e7b18fa8c96c (patch) | |
| tree | fc200054383355019c7f7f46ff07112e5cb64be7 /source/blender/physics | |
| parent | 6f15554af32dc5df0711e0057526b946f37cb353 (diff) | |
Fix compilation error with clang-5
Diffstat (limited to 'source/blender/physics')
| -rw-r--r-- | source/blender/physics/intern/eigen_utils.h | 2 | ||||
| -rw-r--r-- | source/blender/physics/intern/implicit_eigen.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
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 |