summaryrefslogtreecommitdiffstats
path: root/src/exception.cpp
diff options
context:
space:
mode:
authortheraven <theraven@FreeBSD.org>2012-03-14 14:33:36 +0000
committertheraven <theraven@FreeBSD.org>2012-03-14 14:33:36 +0000
commitb72827587c708b2cc7d1ff40b1f6eab96e189dde (patch)
treeb7ab2afd9535ba889a65e8ef7c2bb3796920d33d /src/exception.cpp
parentbaa75b9984d33ea49ffb76a73507b64d879166cc (diff)
downloadFreeBSD-src-b72827587c708b2cc7d1ff40b1f6eab96e189dde.zip
FreeBSD-src-b72827587c708b2cc7d1ff40b1f6eab96e189dde.tar.gz
New version of libc++ with some bug fixes.
Approved by: dim (mentor)
Diffstat (limited to 'src/exception.cpp')
-rw-r--r--src/exception.cpp14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/exception.cpp b/src/exception.cpp
index 6b5e698..6a5803d 100644
--- a/src/exception.cpp
+++ b/src/exception.cpp
@@ -114,13 +114,17 @@ exception::~exception() _NOEXCEPT
{
}
-bad_exception::~bad_exception() _NOEXCEPT
+const char* exception::what() const _NOEXCEPT
{
+ return "std::exception";
}
-const char* exception::what() const _NOEXCEPT
+#endif // _LIBCPPABI_VERSION
+#endif //LIBCXXRT
+#ifndef _LIBCPPABI_VERSION
+
+bad_exception::~bad_exception() _NOEXCEPT
{
- return "std::exception";
}
const char* bad_exception::what() const _NOEXCEPT
@@ -128,8 +132,8 @@ const char* bad_exception::what() const _NOEXCEPT
return "std::bad_exception";
}
-#endif // _LIBCPPABI_VERSION
-#endif //LIBCXXRT
+#endif
+
exception_ptr::~exception_ptr() _NOEXCEPT
{
OpenPOWER on IntegriCloud