summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--external/boost/UnpackedTarball_boost.mk1
-rw-r--r--external/boost/boost.std.move.patch21
2 files changed, 0 insertions, 22 deletions
diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk
index e446e9943f10..bedfc9ad4810 100644
--- a/external/boost/UnpackedTarball_boost.mk
+++ b/external/boost/UnpackedTarball_boost.mk
@@ -43,7 +43,6 @@ boost_patches += boost_1_44_0-unused-parameters.patch
endif
boost_patches += boost.auto_link.patch
-boost_patches += boost.std.move.patch
boost_patches += boost.wunused.patch
boost_patches += ubsan.patch.0
diff --git a/external/boost/boost.std.move.patch b/external/boost/boost.std.move.patch
deleted file mode 100644
index 7c0dfb99ca5a..000000000000
--- a/external/boost/boost.std.move.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ru boost.orig/boost/config/compiler/clang.hpp boost/boost/config/compiler/clang.hpp
---- foo/misc/boost.orig/boost/config/compiler/clang.hpp 2015-05-07 19:11:52.000000000 +0200
-+++ foo/misc/boost/boost/config/compiler/clang.hpp 2015-07-18 22:40:56.304941957 +0200
-@@ -10,6 +10,8 @@
-
- #define BOOST_HAS_PRAGMA_ONCE
-
-+#include <utility>
-+
- // Detecting `-fms-extension` compiler flag assuming that _MSC_VER defined when that flag is used.
- #if defined (_MSC_VER) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 4))
- # define BOOST_HAS_PRAGMA_DETECT_MISMATCH
-@@ -161,7 +163,7 @@
- # define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
- #endif
-
--#if !__has_feature(cxx_rvalue_references)
-+#if !__has_feature(cxx_rvalue_references) || (defined(__APPLE__) && !defined(_LIBCPP_VERSION))
- # define BOOST_NO_CXX11_RVALUE_REFERENCES
- #endif
-