summaryrefslogtreecommitdiffstats
path: root/external/boost/boost_1_60_0.undef.warning.patch
diff options
context:
space:
mode:
Diffstat (limited to 'external/boost/boost_1_60_0.undef.warning.patch')
-rw-r--r--external/boost/boost_1_60_0.undef.warning.patch13
1 files changed, 6 insertions, 7 deletions
diff --git a/external/boost/boost_1_60_0.undef.warning.patch b/external/boost/boost_1_60_0.undef.warning.patch
index df72af63a424..face1bbc4a3e 100644
--- a/external/boost/boost_1_60_0.undef.warning.patch
+++ b/external/boost/boost_1_60_0.undef.warning.patch
@@ -1,17 +1,16 @@
diff -ur boost.orig/boost/detail/workaround.hpp boost/boost/detail/workaround.hpp
--- a/b/boost.orig/boost/detail/workaround.hpp 2015-12-13 13:49:42.000000000 +0100
+++ a/b/boost/boost/detail/workaround.hpp 2016-01-29 15:07:43.427781248 +0100
-@@ -227,6 +227,13 @@
- #else
- #define BOOST_INTEL_WORKAROUND_GUARD 0
- #endif
-+
+@@ -5,6 +5,12 @@
+ #ifndef WORKAROUND_DWA2002126_HPP
+ #define WORKAROUND_DWA2002126_HPP
+
+#ifndef BOOST_GCC_VERSION
+#define BOOST_GCC_VERSION_WORKAROUND_GUARD 1
+#else
+#define BOOST_GCC_VERSION_WORKAROUND_GUARD 0
+#endif
+
- // Always define to zero, if it's used it'll be defined my MPL:
- #define BOOST_MPL_CFG_GCC_WORKAROUND_GUARD 0
+ #include <boost/config/workaround.hpp>
+ #endif // WORKAROUND_DWA2002126_HPP