diff options
| author | David Chisnall <csdavec@swan.ac.uk> | 2012-03-14 14:11:13 +0000 |
|---|---|---|
| committer | David Chisnall <csdavec@swan.ac.uk> | 2012-03-14 14:11:13 +0000 |
| commit | 1e02029f37edc72770ee62a71755affbc40350af (patch) | |
| tree | 4adafc640b743dd897991179d02afb79b737084b /libcxx/src/exception.cpp | |
| parent | 5f13d66fb4153b360f9bd7ee2fcaf7fbb8ce1552 (diff) | |
| download | bcm5719-llvm-1e02029f37edc72770ee62a71755affbc40350af.tar.gz bcm5719-llvm-1e02029f37edc72770ee62a71755affbc40350af.zip | |
Undo some overzealous #ifdefs for LIBCXXRT.
llvm-svn: 152718
Diffstat (limited to 'libcxx/src/exception.cpp')
| -rw-r--r-- | libcxx/src/exception.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/libcxx/src/exception.cpp b/libcxx/src/exception.cpp index 6b5e6984a60..6a5803d3774 100644 --- a/libcxx/src/exception.cpp +++ b/libcxx/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 { |
