Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Parborg <darkdefende@gmail.com>2019-08-21 15:13:09 +0300
committerSebastian Parborg <darkdefende@gmail.com>2019-08-21 15:15:28 +0300
commitb19c437eff7f822e68244fd5a48819ebe0506c90 (patch)
tree73f16c5dec7246c2a4aed79bde5bfda640d613df /extern/Eigen3/Eigen/src/Core/util/ReenableStupidWarnings.h
parent1658fd1f7e32996bdffa87d90806e99565e8b133 (diff)
Update Eigen to 3.3.7
This is in preparation for the QuadriFlow remesher lib. Reviewed By: Brecht Differential Revision: http://developer.blender.org/D5549
Diffstat (limited to 'extern/Eigen3/Eigen/src/Core/util/ReenableStupidWarnings.h')
-rw-r--r--extern/Eigen3/Eigen/src/Core/util/ReenableStupidWarnings.h13
1 files changed, 13 insertions, 0 deletions
diff --git a/extern/Eigen3/Eigen/src/Core/util/ReenableStupidWarnings.h b/extern/Eigen3/Eigen/src/Core/util/ReenableStupidWarnings.h
index 5ddfbd4aa68..ecc82b7c8df 100644
--- a/extern/Eigen3/Eigen/src/Core/util/ReenableStupidWarnings.h
+++ b/extern/Eigen3/Eigen/src/Core/util/ReenableStupidWarnings.h
@@ -8,7 +8,20 @@
#pragma warning pop
#elif defined __clang__
#pragma clang diagnostic pop
+ #elif defined __GNUC__ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
+ #pragma GCC diagnostic pop
#endif
+
+ #if defined __NVCC__
+// Don't reenable the diagnostic messages, as it turns out these messages need
+// to be disabled at the point of the template instantiation (i.e the user code)
+// otherwise they'll be triggered by nvcc.
+// #pragma diag_default code_is_unreachable
+// #pragma diag_default initialization_not_reachable
+// #pragma diag_default 2651
+// #pragma diag_default 2653
+ #endif
+
#endif
#endif // EIGEN_WARNINGS_DISABLED