diff options
| -rw-r--r-- | external/boost/UnpackedTarball_boost.mk | 2 | ||||
| -rw-r--r-- | external/boost/boost-android-unified.patch.1 | 22 |
2 files changed, 0 insertions, 24 deletions
diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk index 1875876f0645..5f0e9066a839 100644 --- a/external/boost/UnpackedTarball_boost.mk +++ b/external/boost/UnpackedTarball_boost.mk @@ -30,8 +30,6 @@ boost_patches += clang-cl.patch.0 boost_patches += boost_1_60_0.undef.warning.patch boost_patches += boost_1_63_0.undef.warning.patch.1 -boost_patches += boost-android-unified.patch.1 - boost_patches += windows-no-utf8-locales.patch.0 boost_patches += msvc2017.patch.0 diff --git a/external/boost/boost-android-unified.patch.1 b/external/boost/boost-android-unified.patch.1 deleted file mode 100644 index 6488bf619e2b..000000000000 --- a/external/boost/boost-android-unified.patch.1 +++ /dev/null @@ -1,22 +0,0 @@ ---- a/boost/type_traits/detail/is_function_cxx_11.hpp -+++ b/boost/type_traits/detail/is_function_cxx_11.hpp -@@ -18,7 +18,7 @@ - template <class T> - struct is_function : public false_type {}; - --#if defined(__cpp_noexcept_function_type) && !defined(BOOST_TT_NO_DEDUCED_NOEXCEPT_PARAM) -+#if defined(__cpp_noexcept_function_type) && !defined(BOOST_TT_NO_DEDUCED_NOEXCEPT_PARAM) && !(defined __ANDROID__ && defined __clang__ && __clang_major__ == 5 && __clang_minor__ == 0 && __clang_patchlevel__ == 300080) - #define BOOST_TT_NOEXCEPT_PARAM , bool NE - #define BOOST_TT_NOEXCEPT_DECL noexcept(NE) - #else ---- a/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp -+++ b/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp -@@ -31,7 +31,7 @@ - template <class T> - struct is_member_function_pointer<T const volatile> : public is_member_function_pointer<T> {}; - --#if defined(BOOST_TT_NO_DEDUCED_NOEXCEPT_PARAM) -+#if defined(BOOST_TT_NO_DEDUCED_NOEXCEPT_PARAM) || (defined __ANDROID__ && defined __clang__ && __clang_major__ == 5 && __clang_minor__ == 0 && __clang_patchlevel__ == 300080) - // MSVC can't handle noexcept(b) as a deduced template parameter - // so we will have to write everything out :( - #define BOOST_TT_NOEXCEPT_PARAM |