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

Undo some overzealous #ifdefs for LIBCXXRT.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@152718 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
David Chisnall 2012-03-14 14:11:13 +00:00
parent f2533a8798
commit 21a84cfb8f
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/exception.cpp
View File

@ -114,22 +114,26 @@ exception::~exception() _NOEXCEPT
{ {
} }
bad_exception::~bad_exception() _NOEXCEPT
{
}
const char* exception::what() const _NOEXCEPT const char* exception::what() const _NOEXCEPT
{ {
return "std::exception"; return "std::exception";
} }
#endif // _LIBCPPABI_VERSION
#endif //LIBCXXRT
#ifndef _LIBCPPABI_VERSION
bad_exception::~bad_exception() _NOEXCEPT
{
}
const char* bad_exception::what() const _NOEXCEPT const char* bad_exception::what() const _NOEXCEPT
{ {
return "std::bad_exception"; return "std::bad_exception";
} }
#endif // _LIBCPPABI_VERSION #endif
#endif //LIBCXXRT
exception_ptr::~exception_ptr() _NOEXCEPT exception_ptr::~exception_ptr() _NOEXCEPT
{ {

7
src/new.cpp
View File

@ -24,8 +24,6 @@
static std::new_handler __new_handler; static std::new_handler __new_handler;
#endif #endif
#if !defined (LIBCXXRT) // && !defined(_LIBCPPABI_VERSION)
// Implement all new and delete operators as weak definitions // Implement all new and delete operators as weak definitions
// in this shared library, so that they can be overriden by programs // in this shared library, so that they can be overriden by programs
// that define non-weak copies of the functions. // that define non-weak copies of the functions.
@ -134,8 +132,6 @@ operator delete[] (void* ptr, const std::nothrow_t&) _NOEXCEPT
::operator delete[](ptr); ::operator delete[](ptr);
} }
#endif // !_LIBCPPABI_VERSION && !LIBCXXRT
namespace std namespace std
{ {
@ -171,6 +167,8 @@ bad_alloc::what() const _NOEXCEPT
return "std::bad_alloc"; return "std::bad_alloc";
} }
#endif //LIBCXXRT
bad_array_new_length::bad_array_new_length() _NOEXCEPT bad_array_new_length::bad_array_new_length() _NOEXCEPT
{ {
} }
@ -186,7 +184,6 @@ bad_array_new_length::what() const _NOEXCEPT
} }
#endif #endif
#endif //LIBCXXRT
void void
__throw_bad_alloc() __throw_bad_alloc()