forked from amazingfate/loongoffice
e355d2dc89
Change-Id: Ica4aba467aa00236a4d1c5b0411d1ebc657ea4df Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86594 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
23 lines
1.2 KiB
Groff
23 lines
1.2 KiB
Groff
--- 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
|