From f5f2e624db4710040d5b240a3b81ebb95bcdfe3c Mon Sep 17 00:00:00 2001 From: Jan-Marek Glogowski Date: Fri, 25 Jan 2019 21:56:41 +0100 Subject: Just define the __clang_major___WORKAROUND_GUARD Change-Id: I84e969005ac2a96da449b5434ee5fdb37fc9b432 --- external/boost/UnpackedTarball_boost.mk | 2 -- external/boost/Wundef.patch.0 | 11 ----------- external/boost/boost_1_60_0.undef.warning.patch | 8 +++++++- 3 files changed, 7 insertions(+), 14 deletions(-) delete mode 100644 external/boost/Wundef.patch.0 diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk index f20bd08d8c15..86f52ded439e 100644 --- a/external/boost/UnpackedTarball_boost.mk +++ b/external/boost/UnpackedTarball_boost.mk @@ -40,8 +40,6 @@ boost_patches += msvc2017.patch.0 boost_patches += sse.patch.0 -boost_patches += Wundef.patch.0 - $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost)) $(eval $(call gb_UnpackedTarball_set_tarball,boost,$(BOOST_TARBALL))) diff --git a/external/boost/Wundef.patch.0 b/external/boost/Wundef.patch.0 deleted file mode 100644 index aa2d383435d0..000000000000 --- a/external/boost/Wundef.patch.0 +++ /dev/null @@ -1,11 +0,0 @@ ---- boost/type_traits/detail/config.hpp -+++ boost/type_traits/detail/config.hpp -@@ -82,7 +82,7 @@ - // Can we implement accurate is_function/is_member_function_pointer (post C++03)? - // - #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !BOOST_WORKAROUND(BOOST_GCC, < 40900)\ -- && !BOOST_WORKAROUND(BOOST_MSVC, < 1900) && !BOOST_WORKAROUND(__clang_major__, <= 4) -+ && !BOOST_WORKAROUND(BOOST_MSVC, < 1900) && !(defined __clang_major__ && BOOST_WORKAROUND(__clang_major__, <= 4)) - # define BOOST_TT_HAS_ASCCURATE_IS_FUNCTION - #endif - diff --git a/external/boost/boost_1_60_0.undef.warning.patch b/external/boost/boost_1_60_0.undef.warning.patch index 79441d6cc1fc..0678afa9d5ce 100644 --- a/external/boost/boost_1_60_0.undef.warning.patch +++ b/external/boost/boost_1_60_0.undef.warning.patch @@ -1,6 +1,6 @@ --- a/b/boost/boost/config/workaround.hpp +++ a/b/boost/boost/config/workaround.hpp -@@ -237,6 +237,13 @@ +@@ -237,6 +237,19 @@ #else #define BOOST_INTEL_WORKAROUND_GUARD 0 #endif @@ -10,6 +10,12 @@ +#else +#define BOOST_GCC_VERSION_WORKAROUND_GUARD 0 +#endif ++ ++#ifndef __clang_major___WORKAROUND_GUARD ++#define __clang_major___WORKAROUND_GUARD 1 ++#else ++#define __clang_major___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 -- cgit v1.2.3