aboutsummaryrefslogtreecommitdiff
path: root/system/lib/libcxx/typeinfo.cpp
diff options
context:
space:
mode:
authorBruce Mitchener <bruce.mitchener@gmail.com>2013-11-07 15:49:37 +0700
committerBruce Mitchener <bruce.mitchener@gmail.com>2013-11-07 16:07:18 +0700
commit44af976a44bc194b985fdb880f99a7feff133b5a (patch)
tree400fb651d819c41e26b417d36a4315ec947fd387 /system/lib/libcxx/typeinfo.cpp
parent7f870cf9c357f6a1138ba612ace7d7249f85e250 (diff)
Update libcxx to 194185, 2013-11-07.
This brings C++14 support.
Diffstat (limited to 'system/lib/libcxx/typeinfo.cpp')
-rw-r--r--system/lib/libcxx/typeinfo.cpp15
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