diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-11-08 15:56:02 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-11-08 15:56:02 -0800 |
| commit | e0268fa1035a718341c53921eee9318d4a8033cd (patch) | |
| tree | 2b3eeb07928f9521498332002444dbfa44f34dfb /system/lib/libcxx/typeinfo.cpp | |
| parent | a11272805c16be75f5e6d00c8214afcac7ba9d05 (diff) | |
| parent | ad1da1e6685d4483e096d7e0bbd8e38e686bd322 (diff) | |
Merge pull request #1767 from waywardmonkeys/update-libcxx1.7.2
Update libcxx
Diffstat (limited to 'system/lib/libcxx/typeinfo.cpp')
| -rw-r--r-- | system/lib/libcxx/typeinfo.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/system/lib/libcxx/typeinfo.cpp b/system/lib/libcxx/typeinfo.cpp index 60828944..b4281209 100644 --- a/system/lib/libcxx/typeinfo.cpp +++ b/system/lib/libcxx/typeinfo.cpp @@ -20,12 +20,18 @@ #include "typeinfo" -#if !(defined(_LIBCPPABI_VERSION) || defined(LIBCXXRT)) +#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 // _LIBCPPABI_VERSION +#endif // !__GLIBCXX__ +#endif // !LIBCXXRT && !_LIBCPPABI_VERSION |