aboutsummaryrefslogtreecommitdiffhomepage
path: root/Eigen/src/Core/util/ReenableStupidWarnings.h
diff options
context:
space:
mode:
authorGravatar Benoit Jacob <jacob.benoit.1@gmail.com>2011-02-22 10:05:41 -0500
committerGravatar Benoit Jacob <jacob.benoit.1@gmail.com>2011-02-22 10:05:41 -0500
commitc58a2ff03ada9cbdf0519ac0cd91afa46c0d75e0 (patch)
tree7e56920976798b67bbd756ec8f26ebfbaa3a8338 /Eigen/src/Core/util/ReenableStupidWarnings.h
parent9e1127619c0f6bd6ce00ea2b341238ee7cd2a8f3 (diff)
add EIGEN_PERMANENTLY_DISABLE_STUPID_WARNINGS non-default option. Use it in our own CMakeLists. also add a include-guard-like mechanism to prevent doing unmatched #pragma warning push/pop.
Diffstat (limited to 'Eigen/src/Core/util/ReenableStupidWarnings.h')
-rw-r--r--Eigen/src/Core/util/ReenableStupidWarnings.h17
1 files changed, 12 insertions, 5 deletions
diff --git a/Eigen/src/Core/util/ReenableStupidWarnings.h b/Eigen/src/Core/util/ReenableStupidWarnings.h
index 92d2d95c0..4bd1d1506 100644
--- a/Eigen/src/Core/util/ReenableStupidWarnings.h
+++ b/Eigen/src/Core/util/ReenableStupidWarnings.h
@@ -1,5 +1,12 @@
-#ifdef _MSC_VER
- #pragma warning( pop )
-#elif defined __INTEL_COMPILER
- #pragma warning pop
-#endif \ No newline at end of file
+#ifdef EIGEN_WARNINGS_DISABLED
+#undef EIGEN_WARNINGS_DISABLED
+
+#ifndef EIGEN_PERMANENTLY_DISABLE_STUPID_WARNINGS
+ #ifdef _MSC_VER
+ #pragma warning( pop )
+ #elif defined __INTEL_COMPILER
+ #pragma warning pop
+ #endif
+#endif
+
+#endif // EIGEN_WARNINGS_DISABLED \ No newline at end of file