summaryrefslogtreecommitdiff
path: root/external/bsd/libc++/dist/libcxx/src/exception.cpp
diff options
context:
space:
mode:
authorjoerg <joerg@NetBSD.org>2013-11-28 13:45:08 +0000
committerjoerg <joerg@NetBSD.org>2013-11-28 13:45:08 +0000
commitac2d417450cfa10279645dd54aa9461af6bf0152 (patch)
treee5054288a71a78558ce7f601d04bcfb7e7e957f6 /external/bsd/libc++/dist/libcxx/src/exception.cpp
parent113fb6db05aa7a9d06c944ff164752f7e8489d63 (diff)
Import libc++ r195694, primarily to avoid using a public identifier as
template argument that is overriden by macro in pkgsrc.
Diffstat (limited to 'external/bsd/libc++/dist/libcxx/src/exception.cpp')
-rw-r--r--external/bsd/libc++/dist/libcxx/src/exception.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/external/bsd/libc++/dist/libcxx/src/exception.cpp b/external/bsd/libc++/dist/libcxx/src/exception.cpp
index 9dbb1fae790..3ce6f2e1118 100644
--- a/external/bsd/libc++/dist/libcxx/src/exception.cpp
+++ b/external/bsd/libc++/dist/libcxx/src/exception.cpp
@@ -24,7 +24,7 @@
#ifndef _LIBCPPABI_VERSION
using namespace __cxxabiapple;
// On Darwin, there are two STL shared libraries and a lower level ABI
- // shared libray. The globals holding the current terminate handler and
+ // shared library. The globals holding the current terminate handler and
// current unexpected handler are in the ABI library.
#define __terminate_handler __cxxabiapple::__cxa_terminate_handler
#define __unexpected_handler __cxxabiapple::__cxa_unexpected_handler
@@ -79,7 +79,7 @@ get_terminate() _NOEXCEPT
return __sync_fetch_and_add(&__terminate_handler, (terminate_handler)0);
}
-#ifndef EMSCRIPTEN // We provide this in JS
+#ifndef __EMSCRIPTEN__ // We provide this in JS
_LIBCPP_NORETURN
void
terminate() _NOEXCEPT
@@ -102,10 +102,10 @@ terminate() _NOEXCEPT
}
#endif // _LIBCPP_NO_EXCEPTIONS
}
-#endif // !EMSCRIPTEN
+#endif // !__EMSCRIPTEN__
#endif // !defined(LIBCXXRT) && !defined(_LIBCPPABI_VERSION)
-#if !defined(LIBCXXRT) && !defined(__GLIBCXX__) && !defined(EMSCRIPTEN)
+#if !defined(LIBCXXRT) && !defined(__GLIBCXX__) && !defined(__EMSCRIPTEN__)
bool uncaught_exception() _NOEXCEPT
{
#if defined(__APPLE__) || defined(_LIBCPPABI_VERSION)