commit 54b409fdb9489b305bf95f4d4f52b49c7926c429
author Howard Hinnant <hhinnant@apple.com> Wed Aug 11 17:04:31 2010 +0000
committer Howard Hinnant <hhinnant@apple.com> Wed Aug 11 17:04:31 2010 +0000
tree 4e1c893fe8a940ea767c4eef990dff879fcbbd25
parent 37aab7674a74dd0224b14976e91f89abe48e9ae9

now works with -fno-exceptions and -fno-rtti

llvm-svn: 110828

libcxx/src/exception.cpp

diff --git a/libcxx/src/exception.cpp b/libcxx/src/exception.cpp
index 9bed6f4..7c52115 100644
--- a/libcxx/src/exception.cpp
+++ b/libcxx/src/exception.cpp
@@ -54,15 +54,21 @@
 void
 std::terminate()
 {
-    try {
+#ifndef _LIBCPP_NO_EXCEPTIONS
+    try
+    {
+#endif
         (*__terminate_handler)();
         // handler should not return
         ::abort ();
+#ifndef _LIBCPP_NO_EXCEPTIONS
     } 
-    catch (...) {
+    catch (...)
+    {
         // handler should not throw exception
         ::abort ();
     }
+#endif
 }