diff options
| author | Chandler Carruth <chandlerc@gmail.com> | 2013-09-25 20:01:44 +0000 |
|---|---|---|
| committer | Chandler Carruth <chandlerc@gmail.com> | 2013-09-25 20:01:44 +0000 |
| commit | d1754fb3e9e64d5f3ebe15f7200f573b0265cbff (patch) | |
| tree | bcb724731076f495acc4e5bdadd9ddbf6776a2f3 /src | |
| parent | fc910cb9a0b5a1ecd8b1f4c1c10ca54e2e433aa7 (diff) | |
| download | external_libcxx-d1754fb3e9e64d5f3ebe15f7200f573b0265cbff.tar.gz external_libcxx-d1754fb3e9e64d5f3ebe15f7200f573b0265cbff.tar.bz2 external_libcxx-d1754fb3e9e64d5f3ebe15f7200f573b0265cbff.zip | |
Make the guard for external ABI libraries include the guard for
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/typeinfo.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/typeinfo.cpp b/src/typeinfo.cpp index 60828944a..3bb6fda9e 100644 --- a/src/typeinfo.cpp +++ b/src/typeinfo.cpp @@ -20,7 +20,7 @@ #include "typeinfo" -#if !(defined(_LIBCPPABI_VERSION) || defined(LIBCXXRT)) +#if !defined(LIBCXXRT) && !defined(_LIBCPPABI_VERSION) && !defined(__GLIBCXX__) std::bad_cast::bad_cast() _NOEXCEPT { @@ -67,4 +67,4 @@ std::bad_typeid::what() const _NOEXCEPT } #endif -#endif // _LIBCPPABI_VERSION +#endif // !LIBCXXRT && !_LIBCPPABI_VERSION && !__GLIBCXX__ |