diff options
| author | Eric Fiselier <eric@efcs.ca> | 2016-12-03 03:22:11 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2016-12-03 03:22:11 +0000 |
| commit | 613dc646d3f4cc262a2db098da6f94f9d416142b (patch) | |
| tree | 7185d83713f9f09de7a6f92398bdaa9aa810ba28 /libcxx/include/exception | |
| parent | 9a0b4abbbafb164ddc3b53b76e19c1530c34e81f (diff) | |
| download | bcm5719-llvm-613dc646d3f4cc262a2db098da6f94f9d416142b.tar.gz bcm5719-llvm-613dc646d3f4cc262a2db098da6f94f9d416142b.zip | |
Make make_exception_ptr abort with -fno-exceptions
llvm-svn: 288575
Diffstat (limited to 'libcxx/include/exception')
| -rw-r--r-- | libcxx/include/exception | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libcxx/include/exception b/libcxx/include/exception index 686e4ecd057..d8b8cce0254 100644 --- a/libcxx/include/exception +++ b/libcxx/include/exception @@ -79,6 +79,7 @@ template <class E> void rethrow_if_nested(const E& e); #include <__config> #include <cstddef> +#include <cstdlib> #include <type_traits> #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 |
