diff options
Diffstat (limited to 'libcxxabi/src/cxa_exception.hpp')
| -rw-r--r-- | libcxxabi/src/cxa_exception.hpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libcxxabi/src/cxa_exception.hpp b/libcxxabi/src/cxa_exception.hpp index 8badb3b7fc1..6e68f985389 100644 --- a/libcxxabi/src/cxa_exception.hpp +++ b/libcxxabi/src/cxa_exception.hpp @@ -24,9 +24,9 @@ namespace __cxxabiv1 { static const uint64_t kOurExceptionClass = 0x434C4E47432B2B00; // CLNGC++\0 static const uint64_t kOurDependentExceptionClass = 0x434C4E47432B2B01; // CLNGC++\1 -static const uint64_t get_vendor_and_language = 0xFFFFFFFFFFFFFF00; // mask for CLNGC++ - -struct __cxa_exception { +static const uint64_t get_vendor_and_language = 0xFFFFFFFFFFFFFF00; // mask for CLNGC++ + +struct __cxa_exception { #if defined(__LP64__) || LIBCXXABI_ARM_EHABI // This is a new field to support C++ 0x exception_ptr. // For binary compatibility it is at the start of this @@ -34,10 +34,10 @@ struct __cxa_exception { // __cxa_allocate_exception. size_t referenceCount; #endif - + // Manage the exception object itself. std::type_info *exceptionType; - void (*exceptionDestructor)(void *); + void (*exceptionDestructor)(void *); std::unexpected_handler unexpectedHandler; std::terminate_handler terminateHandler; @@ -73,16 +73,16 @@ struct __cxa_dependent_exception { #if defined(__LP64__) || LIBCXXABI_ARM_EHABI void* primaryException; #endif - + std::type_info *exceptionType; - void (*exceptionDestructor)(void *); + void (*exceptionDestructor)(void *); std::unexpected_handler unexpectedHandler; std::terminate_handler terminateHandler; __cxa_exception *nextException; int handlerCount; - + #if LIBCXXABI_ARM_EHABI __cxa_exception* nextPropagatingException; int propagationCount; @@ -93,7 +93,7 @@ struct __cxa_dependent_exception { void * catchTemp; void *adjustedPtr; #endif - + #if !defined(__LP64__) && !LIBCXXABI_ARM_EHABI void* primaryException; #endif |
