diff options
| author | Marshall Clow <mclow.lists@gmail.com> | 2015-06-02 13:03:17 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow.lists@gmail.com> | 2015-06-02 13:03:17 +0000 |
| commit | 604de5c25610bed3ed2b107f6be9ca731f75721b (patch) | |
| tree | 06ebe2edfa3922e107c05d8e783e861d9953bff1 /libcxxabi/include/cxxabi.h | |
| parent | 8e9c266a77a80d2de23433a4e5f35c23eb744fe6 (diff) | |
| download | bcm5719-llvm-604de5c25610bed3ed2b107f6be9ca731f75721b.tar.gz bcm5719-llvm-604de5c25610bed3ed2b107f6be9ca731f75721b.zip | |
Implement uncaught_exceptions() to get a count, rather than a bool. Update the libc++abi version. Reviewed as http://reviews.llvm.org/D10067
llvm-svn: 238827
Diffstat (limited to 'libcxxabi/include/cxxabi.h')
| -rw-r--r-- | libcxxabi/include/cxxabi.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libcxxabi/include/cxxabi.h b/libcxxabi/include/cxxabi.h index 767acfef567..f29253ce1b6 100644 --- a/libcxxabi/include/cxxabi.h +++ b/libcxxabi/include/cxxabi.h @@ -20,7 +20,7 @@ #include <__cxxabi_config.h> -#define _LIBCPPABI_VERSION 1001 +#define _LIBCPPABI_VERSION 1002 #define LIBCXXABI_NORETURN __attribute__((noreturn)) #ifdef __cplusplus @@ -161,8 +161,9 @@ extern void __cxa_rethrow_primary_exception(void* primary_exception); extern void __cxa_increment_exception_refcount(void* primary_exception) throw(); extern void __cxa_decrement_exception_refcount(void* primary_exception) throw(); -// Apple addition to support std::uncaught_exception() -extern bool __cxa_uncaught_exception() throw(); +// Apple extension to support std::uncaught_exception() +extern bool __cxa_uncaught_exception () throw(); +extern unsigned int __cxa_uncaught_exceptions() throw(); #ifdef __linux__ // Linux TLS support. Not yet an official part of the Itanium ABI. |
