LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make make_exception_ptr abort with -fno-exceptions

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@288575 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier
2016-12-03 03:22:11 +00:00
parent dd74cd25d5
commit 81b7f63174
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/exception
View File

@@ -79,6 +79,7 @@ template <class E> void rethrow_if_nested(const E& e);
#include <__config> #include <__config>
#include <cstddef> #include <cstddef>
#include <cstdlib>
#include <type_traits> #include <type_traits>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
@@ -161,7 +162,9 @@ make_exception_ptr(_Ep __e) _NOEXCEPT
{ {
return current_exception(); return current_exception();
} }
#endif // _LIBCPP_NO_EXCEPTIONS #else
_VSTD::abort();
#endif
} }
// nested_exception // nested_exception