[libcxx] r191931 - Re-add bad_cast and bad_typeid default ctor definitions under libsupc++.

Peter Collingbourne peter at pcc.me.uk
Thu Oct 3 15:04:10 PDT 2013


Author: pcc
Date: Thu Oct  3 17:04:10 2013
New Revision: 191931

URL: http://llvm.org/viewvc/llvm-project?rev=191931&view=rev
Log:
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.

Modified:
    libcxx/trunk/src/typeinfo.cpp

Modified: libcxx/trunk/src/typeinfo.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/src/typeinfo.cpp?rev=191931&r1=191930&r2=191931&view=diff
==============================================================================
--- libcxx/trunk/src/typeinfo.cpp (original)
+++ libcxx/trunk/src/typeinfo.cpp Thu Oct  3 17:04:10 2013
@@ -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





More information about the cfe-commits mailing list