diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2013-01-22 14:48:10 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2013-01-22 14:48:10 +0000 |
| commit | f55c0db8b545cd6f89c7b96933dc8c9d2694bc46 (patch) | |
| tree | f2b9bdf54e2ed5578219fab520f55695e70eb457 /libcxx/src/exception.cpp | |
| parent | 2ac1ae6150c006295cd96ea27afd7ff4279b1832 (diff) | |
| download | bcm5719-llvm-f55c0db8b545cd6f89c7b96933dc8c9d2694bc46.tar.gz bcm5719-llvm-f55c0db8b545cd6f89c7b96933dc8c9d2694bc46.zip | |
Saleem Abdulrasool: __terminate_handler and __unexpected_handler are defined but not used when
building against libsupc++ as the functions for which they are used are provided
by libsupc++. Simply preprocess them away when building against libsupc++.
llvm-svn: 173165
Diffstat (limited to 'libcxx/src/exception.cpp')
| -rw-r--r-- | libcxx/src/exception.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/src/exception.cpp b/libcxx/src/exception.cpp index f5e6d2259da..0cd182b716c 100644 --- a/libcxx/src/exception.cpp +++ b/libcxx/src/exception.cpp @@ -33,7 +33,7 @@ #if defined(LIBCXXRT) || defined(_LIBCPPABI_VERSION) #define HAVE_DEPENDENT_EH_ABI 1 #endif -#else // __has_include(<cxxabi.h>) +#elif !defined(__GLIBCXX__) // __has_include(<cxxabi.h>) static std::terminate_handler __terminate_handler; static std::unexpected_handler __unexpected_handler; #endif // __has_include(<cxxabi.h>) |
