summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHoward Hinnant <hhinnant@apple.com>2012-01-24 18:15:20 +0000
committerHoward Hinnant <hhinnant@apple.com>2012-01-24 18:15:20 +0000
commit6830b2a4935ad88810db04ededddec49a5c42857 (patch)
tree15061d826b87e749f25808a4e9019c138df828ff
parent5b9deabae8dc1213bda88067602c7f40ca6c1506 (diff)
downloadbcm5719-llvm-6830b2a4935ad88810db04ededddec49a5c42857.tar.gz
bcm5719-llvm-6830b2a4935ad88810db04ededddec49a5c42857.zip
Move kOurExceptionClass and kOurDependentExceptionClass from source to header so that they can be used in multiple sources. This is a private header, these constants are not publicly exposed.
llvm-svn: 148827
-rw-r--r--libcxxabi/src/cxa_exception.cpp4
-rw-r--r--libcxxabi/src/cxa_exception.hpp3
2 files changed, 4 insertions, 3 deletions
diff --git a/libcxxabi/src/cxa_exception.cpp b/libcxxabi/src/cxa_exception.cpp
index ba4f84dbdc6..c80d60eb02a 100644
--- a/libcxxabi/src/cxa_exception.cpp
+++ b/libcxxabi/src/cxa_exception.cpp
@@ -34,9 +34,7 @@
namespace __cxxabiv1 {
-static const uint64_t kOurExceptionClass = 0x434C4E47432B2B00; // CLNGC++\0
-static const uint64_t kOurDependentExceptionClass = 0x434C4E47432B2B01; // CLNGC++\1
-
+
// Utility routines
static
inline
diff --git a/libcxxabi/src/cxa_exception.hpp b/libcxxabi/src/cxa_exception.hpp
index 346ed38572b..88e3975bdec 100644
--- a/libcxxabi/src/cxa_exception.hpp
+++ b/libcxxabi/src/cxa_exception.hpp
@@ -17,6 +17,9 @@
namespace __cxxabiv1 {
+static const uint64_t kOurExceptionClass = 0x434C4E47432B2B00; // CLNGC++\0
+static const uint64_t kOurDependentExceptionClass = 0x434C4E47432B2B01; // CLNGC++\1
+
struct __cxa_exception {
#if __LP64__
// This is a new field to support C++ 0x exception_ptr.
OpenPOWER on IntegriCloud