generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make the guard for external ABI libraries include the guard for

Browse Source 
libsupc++ in typeinfo.cpp, bringing it into agreement with
exception.cpp. This fixes link errors due to duplicate symbols from
this translation unit.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@191397 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chandler Carruth
2013-09-25 20:01:44 +00:00
parent fc910cb9a0
commit d1754fb3e9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/typeinfo.cpp
View File

@@ -20,7 +20,7 @@
#include "typeinfo" #include "typeinfo"
#if !(defined(_LIBCPPABI_VERSION) || defined(LIBCXXRT)) #if !defined(LIBCXXRT) && !defined(_LIBCPPABI_VERSION) && !defined(__GLIBCXX__)
std::bad_cast::bad_cast() _NOEXCEPT std::bad_cast::bad_cast() _NOEXCEPT
{ {
@@ -67,4 +67,4 @@ std::bad_typeid::what() const _NOEXCEPT
} }
#endif #endif
#endif // _LIBCPPABI_VERSION #endif // !LIBCXXRT && !_LIBCPPABI_VERSION && !__GLIBCXX__