summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMarshall Clow <mclow.lists@gmail.com>2015-06-02 13:03:17 +0000
committerMarshall Clow <mclow.lists@gmail.com>2015-06-02 13:03:17 +0000
commit5013d7c4d0baf9c67939f123fea6f5b3dc31052d (patch)
tree0b9d313a4e94fa15451934584301f84963603877 /include
parent088a71b42035921caa1fa06238c44dd19a7e369d (diff)
Implement uncaught_exceptions() to get a count, rather than a bool. Update the libc++abi version. Reviewed as http://reviews.llvm.org/D10067
git-svn-id: https://llvm.org/svn/llvm-project/libcxxabi/trunk@238827 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include')
-rw-r--r--include/cxxabi.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/cxxabi.h b/include/cxxabi.h
index 767acfe..f29253c 100644
--- a/include/cxxabi.h
+++ b/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.