From 81b7f63174b5a6516f965d449dcdddfe1948010f Mon Sep 17 00:00:00 2001 From: Eric Fiselier Date: Sat, 3 Dec 2016 03:22:11 +0000 Subject: [PATCH] Make make_exception_ptr abort with -fno-exceptions git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@288575 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/exception | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/exception b/include/exception index 686e4ecd0..d8b8cce02 100644 --- a/include/exception +++ b/include/exception @@ -79,6 +79,7 @@ template void rethrow_if_nested(const E& e); #include <__config> #include +#include #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) @@ -161,7 +162,9 @@ make_exception_ptr(_Ep __e) _NOEXCEPT { return current_exception(); } -#endif // _LIBCPP_NO_EXCEPTIONS +#else + _VSTD::abort(); +#endif } // nested_exception