diff options
Diffstat (limited to 'external/boost/boost-android-unified.patch.1')
| -rw-r--r-- | external/boost/boost-android-unified.patch.1 | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/external/boost/boost-android-unified.patch.1 b/external/boost/boost-android-unified.patch.1 new file mode 100644 index 000000000..6488bf619 --- /dev/null +++ b/external/boost/boost-android-unified.patch.1 @@ -0,0 +1,22 @@ +--- 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 |