1 files changed, 16 insertions, 47 deletions
diff --git a/external/boost/boost_1_60_0.undef.warning.patch b/external/boost/boost_1_60_0.undef.warning.patch
index 22eac09657d8..df72af63a424 100644
--- a/external/boost/boost_1_60_0.undef.warning.patch
+++ b/external/boost/boost_1_60_0.undef.warning.patch
@@ -1,48 +1,17 @@
-diff -ur boost.orig/boost/type_traits/is_constructible.hpp boost/boost/type_traits/is_constructible.hpp
---- a/b/boost.orig/boost/type_traits/is_constructible.hpp	2015-12-13 13:49:42.000000000 +0100
-+++ a/b/boost/boost/type_traits/is_constructible.hpp	2016-01-29 15:07:05.859781670 +0100
-@@ -12,7 +12,7 @@
- #include <boost/type_traits/integral_constant.hpp>
- #include <boost/detail/workaround.hpp>
+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
++
++#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
  
--#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_DECLTYPE) && !BOOST_WORKAROUND(BOOST_MSVC, < 1800) && !BOOST_WORKAROUND(BOOST_GCC_VERSION, < 40500)
-+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_DECLTYPE) && !BOOST_WORKAROUND(BOOST_MSVC, < 1800)
- 
- #include <boost/type_traits/is_destructible.hpp>
- #include <boost/type_traits/is_default_constructible.hpp>
-diff -ur boost.orig/boost/type_traits/is_copy_constructible.hpp boost/boost/type_traits/is_copy_constructible.hpp
---- a/b/boost.orig/boost/type_traits/is_copy_constructible.hpp	2015-12-13 13:49:42.000000000 +0100
-+++ a/b/boost/boost/type_traits/is_copy_constructible.hpp	2016-01-29 15:06:48.839781861 +0100
-@@ -12,7 +12,7 @@
- #include <boost/config.hpp>
- #include <boost/detail/workaround.hpp>
- 
--#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_DECLTYPE) && !BOOST_WORKAROUND(BOOST_MSVC, < 1800) && !BOOST_WORKAROUND(BOOST_GCC_VERSION, < 40900)
-+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_DECLTYPE) && !BOOST_WORKAROUND(BOOST_MSVC, < 1800)
- 
- #include <boost/type_traits/is_constructible.hpp>
- 
-diff -ur boost.orig/boost/type_traits/is_default_constructible.hpp boost/boost/type_traits/is_default_constructible.hpp
---- a/b/boost.orig/boost/type_traits/is_default_constructible.hpp	2015-12-13 13:49:42.000000000 +0100
-+++ a/b/boost/boost/type_traits/is_default_constructible.hpp	2016-01-29 15:07:43.427781248 +0100
-@@ -12,7 +12,7 @@
- #include <boost/type_traits/integral_constant.hpp>
- #include <boost/detail/workaround.hpp>
- 
--#if !defined(BOOST_NO_CXX11_DECLTYPE) && !BOOST_WORKAROUND(BOOST_MSVC, < 1800) && !BOOST_WORKAROUND(BOOST_GCC_VERSION, < 40500)
-+#if !defined(BOOST_NO_CXX11_DECLTYPE) && !BOOST_WORKAROUND(BOOST_MSVC, < 1800)
- 
- #include <boost/type_traits/detail/yes_no_type.hpp>
- 
-diff -ur boost.orig/boost/type_traits/is_nothrow_move_constructible.hpp boost/boost/type_traits/is_nothrow_move_constructible.hpp
---- a/b/boost.orig/boost/type_traits/is_nothrow_move_constructible.hpp	2015-12-13 13:49:42.000000000 +0100
-+++ a/b/boost/boost/type_traits/is_nothrow_move_constructible.hpp	2016-01-29 15:05:06.191783015 +0100
-@@ -26,7 +26,7 @@
- template <class T> struct is_nothrow_move_constructible<volatile T> : public ::boost::false_type {};
- template <class T> struct is_nothrow_move_constructible<const volatile T> : public ::boost::false_type{};
- 
--#elif !defined(BOOST_NO_CXX11_NOEXCEPT) && !defined(BOOST_NO_SFINAE_EXPR) && !BOOST_WORKAROUND(BOOST_GCC_VERSION, < 40700)
-+#elif !defined(BOOST_NO_CXX11_NOEXCEPT) && !defined(BOOST_NO_SFINAE_EXPR)
- 
- #include <boost/type_traits/declval.hpp>
- #include <boost/utility/enable_if.hpp>