diff options
| author | theraven <theraven@FreeBSD.org> | 2012-03-14 14:40:22 +0000 |
|---|---|---|
| committer | theraven <theraven@FreeBSD.org> | 2012-03-14 14:40:22 +0000 |
| commit | eccfeea8a5f95c5484d846fba96de60c97d00c2c (patch) | |
| tree | d9a45c8129e1de9dfacd43f81cfb6e078d747f65 /contrib/libc++/src/exception.cpp | |
| parent | ff1fc6fb5cf6febb3683f7cb3824ab6b4d7ad43f (diff) | |
| download | FreeBSD-src-eccfeea8a5f95c5484d846fba96de60c97d00c2c.zip FreeBSD-src-eccfeea8a5f95c5484d846fba96de60c97d00c2c.tar.gz | |
Import a slightly newer libc++, with some bugs fixed that were found by running
the test suite on FreeBSD.
Approved by: dim (mentor)
Diffstat (limited to 'contrib/libc++/src/exception.cpp')
| -rw-r--r-- | contrib/libc++/src/exception.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/contrib/libc++/src/exception.cpp b/contrib/libc++/src/exception.cpp index 6b5e698..6a5803d 100644 --- a/contrib/libc++/src/exception.cpp +++ b/contrib/libc++/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 { |
