summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '3rdParty/Boost/src/boost/random/detail/disable_warnings.hpp')
-rw-r--r--3rdParty/Boost/src/boost/random/detail/disable_warnings.hpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/3rdParty/Boost/src/boost/random/detail/disable_warnings.hpp b/3rdParty/Boost/src/boost/random/detail/disable_warnings.hpp
index f3ade5e..d875004 100644
--- a/3rdParty/Boost/src/boost/random/detail/disable_warnings.hpp
+++ b/3rdParty/Boost/src/boost/random/detail/disable_warnings.hpp
@@ -7,7 +7,7 @@
*
* See http://www.boost.org for most recent version including documentation.
*
- * $Id: disable_warnings.hpp 60755 2010-03-22 00:45:06Z steven_watanabe $
+ * $Id$
*
*/
@@ -21,3 +21,8 @@
#pragma warning(disable:4127)
#pragma warning(disable:4724)
#endif
+
+#if defined(BOOST_GCC) && BOOST_GCC >= 40600
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wlogical-op"
+#endif