summaryrefslogtreecommitdiffstats
path: root/libcxx/src
diff options
context:
space:
mode:
authorMarshall Clow <mclow.lists@gmail.com>2018-05-29 22:25:42 +0000
committerMarshall Clow <mclow.lists@gmail.com>2018-05-29 22:25:42 +0000
commit3a92ecc8e6452c9369e1202c99dc14e0a1b8e62c (patch)
tree2758338c1d0fe8819cee081056e1d093d5e242f2 /libcxx/src
parent6592c7c9214388190534a7b5e6475c5ec4e00fc0 (diff)
downloadbcm5719-llvm-3a92ecc8e6452c9369e1202c99dc14e0a1b8e62c.tar.gz
bcm5719-llvm-3a92ecc8e6452c9369e1202c99dc14e0a1b8e62c.zip
Fix embarrasing typo in uncaught_exceptions. Update tests to really test this. Thanks to Peter Klotz for calling my attention to this.
llvm-svn: 333467
Diffstat (limited to 'libcxx/src')
-rw-r--r--libcxx/src/support/runtime/exception_libcxxabi.ipp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/src/support/runtime/exception_libcxxabi.ipp b/libcxx/src/support/runtime/exception_libcxxabi.ipp
index c3dcf1ec591..feefc515289 100644
--- a/libcxx/src/support/runtime/exception_libcxxabi.ipp
+++ b/libcxx/src/support/runtime/exception_libcxxabi.ipp
@@ -18,7 +18,7 @@ bool uncaught_exception() _NOEXCEPT { return uncaught_exceptions() > 0; }
int uncaught_exceptions() _NOEXCEPT
{
-# if _LIBCPPABI_VERSION > 1101
+# if _LIBCPPABI_VERSION > 1001
return __cxa_uncaught_exceptions();
# else
return __cxa_uncaught_exception() ? 1 : 0;
OpenPOWER on IntegriCloud