Add a descriptive name for a constant. Also I'm at least temporarily waging war on throw specs, both old and new style. Except where we have already publicly exposed the throw spec, I'm getting rid of them. They may come back later. But they seem somewhat prone to cyclic dependencies here. The throw spec implies compiler generated code that this library has to jump to during stack unwinding. I'd like to minimize the possiblity that the code used to properly make that jump is itself creating such jumps.

git-svn-id: https://llvm.org/svn/llvm-project/libcxxabi/trunk@149251 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 8 insertions, 8 deletions

diff --git a/src/cxa_unexpected.cpp b/src/cxa_unexpected.cpp
index 98c6a16..f6e6b6a 100644
--- a/src/cxa_unexpected.cpp
+++ b/src/cxa_unexpected.cpp
@@ -8,20 +8,20 @@
 //===----------------------------------------------------------------------===//
 
 #include <exception>
+#include <cxxabi.h>
+#include "cxa_exception.hpp"
+
+namespace __cxxabiv1
+{
 
 #pragma GCC visibility push(default)
 
 extern "C"
 {
 
-__attribute__((noreturn))
-void
-__cxa_call_unexpected (void*)
-{
-    // TODO:  Completely unfinished!
-    std::terminate();
-}
-
 }
 
 #pragma GCC visibility pop
+
+}  // namespace __cxxabiv1
+