diff options
| author | Peter Collingbourne <peter@pcc.me.uk> | 2013-10-03 22:04:10 +0000 |
|---|---|---|
| committer | Peter Collingbourne <peter@pcc.me.uk> | 2013-10-03 22:04:10 +0000 |
| commit | 3a572699e469d4145d5136a5244e85753571842d (patch) | |
| tree | ae9b206813dad1541185bf6197cd483489f7d28d /libcxx/src | |
| parent | 4806fcd6974cd47a505e2b3e599b9a34da1e9899 (diff) | |
| download | bcm5719-llvm-3a572699e469d4145d5136a5244e85753571842d.tar.gz bcm5719-llvm-3a572699e469d4145d5136a5244e85753571842d.zip | |
Re-add bad_cast and bad_typeid default ctor definitions under libsupc++.
libsupc++ declares these constructors inline, so we won't necessarily
get a definition for them in the library.
llvm-svn: 191931
Diffstat (limited to 'libcxx/src')
| -rw-r--r-- | libcxx/src/typeinfo.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/libcxx/src/typeinfo.cpp b/libcxx/src/typeinfo.cpp index 3bb6fda9ee7..b4281209170 100644 --- a/libcxx/src/typeinfo.cpp +++ b/libcxx/src/typeinfo.cpp @@ -20,12 +20,18 @@ #include "typeinfo" -#if !defined(LIBCXXRT) && !defined(_LIBCPPABI_VERSION) && !defined(__GLIBCXX__) +#if !defined(LIBCXXRT) && !defined(_LIBCPPABI_VERSION) std::bad_cast::bad_cast() _NOEXCEPT { } +std::bad_typeid::bad_typeid() _NOEXCEPT +{ +} + +#ifndef __GLIBCXX__ + std::bad_cast::~bad_cast() _NOEXCEPT { } @@ -36,10 +42,6 @@ std::bad_cast::what() const _NOEXCEPT return "std::bad_cast"; } -std::bad_typeid::bad_typeid() _NOEXCEPT -{ -} - std::bad_typeid::~bad_typeid() _NOEXCEPT { } @@ -67,4 +69,5 @@ std::bad_typeid::what() const _NOEXCEPT } #endif -#endif // !LIBCXXRT && !_LIBCPPABI_VERSION && !__GLIBCXX__ +#endif // !__GLIBCXX__ +#endif // !LIBCXXRT && !_LIBCPPABI_VERSION |
