aboutsummaryrefslogtreecommitdiff
path: root/system/lib/libcxxabi/src/cxa_exception.hpp
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2014-01-15 17:01:19 -0800
committerAlon Zakai <alonzakai@gmail.com>2014-01-15 17:01:19 -0800
commitc42b937808924f6b922b29d2e0fd1fe1d1b0411c (patch)
tree4027d435b6638a7e72b9519990298fb9314ecc96 /system/lib/libcxxabi/src/cxa_exception.hpp
parent8478d6aee54d6c52de16d8c58309534afbf5bf9e (diff)
parente5ccf17e84e7a5102bf9e05ffef01e6672b4c15a (diff)
Merge branch 'incoming'
Diffstat (limited to 'system/lib/libcxxabi/src/cxa_exception.hpp')
-rw-r--r--system/lib/libcxxabi/src/cxa_exception.hpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/system/lib/libcxxabi/src/cxa_exception.hpp b/system/lib/libcxxabi/src/cxa_exception.hpp
index 66f05c45..22c4da38 100644
--- a/system/lib/libcxxabi/src/cxa_exception.hpp
+++ b/system/lib/libcxxabi/src/cxa_exception.hpp
@@ -41,19 +41,19 @@ static const uint64_t get_vendor_and_language = 0xFFFFFFFFFFFFFF00; // mask
std::unexpected_handler unexpectedHandler;
std::terminate_handler terminateHandler;
- __cxa_exception *nextException;
+ __cxa_exception *nextException;
- int handlerCount;
+ int handlerCount;
#ifdef __ARM_EABI_UNWINDER__
- __cxa_exception* nextPropagatingException;
- int propagationCount;
+ __cxa_exception* nextPropagatingException;
+ int propagationCount;
#else
- int handlerSwitchValue;
- const unsigned char *actionRecord;
- const unsigned char *languageSpecificData;
- void *catchTemp;
- void *adjustedPtr;
+ int handlerSwitchValue;
+ const unsigned char *actionRecord;
+ const unsigned char *languageSpecificData;
+ void *catchTemp;
+ void *adjustedPtr;
#endif
#if !__LP64__