[libcxx] r288575 - Make make_exception_ptr abort with -fno-exceptions

[Eric Fiselier via cfe-commits]

Author: ericwf
Date: Fri Dec  2 21:22:11 2016
New Revision: 288575

URL: http://llvm.org/viewvc/llvm-project?rev=288575&view=rev
Log:
Make make_exception_ptr abort with -fno-exceptions

Modified:
    libcxx/trunk/include/exception

Modified: libcxx/trunk/include/exception
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/exception?rev=288575&r1=288574&r2=288575&view=diff
==============================================================================
--- libcxx/trunk/include/exception (original)
+++ libcxx/trunk/include/exception Fri Dec  2 21:22:11 2016
@@ -79,6 +79,7 @@ template <class E> void rethrow_if_neste
 
 #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