diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-06-08 09:02:54 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-06-08 09:02:54 +0000 |
| commit | 9e3359da54ff7d68b6811c69d68b35a037bc10f3 (patch) | |
| tree | d236987c163df76b8b17aa8e1b4db328dc1ceb37 /libstdc++-v3/libsupc++ | |
| parent | 4cb0c64a22e7e7df9b2e34f4fbd3a17443a61178 (diff) | |
| download | gcc-9e3359da54ff7d68b6811c69d68b35a037bc10f3.tar.gz | |
2009-06-08 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk r148271
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@148272 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/libsupc++')
| -rw-r--r-- | libstdc++-v3/libsupc++/eh_ptr.cc | 6 | ||||
| -rw-r--r-- | libstdc++-v3/libsupc++/exception_ptr.h | 12 |
2 files changed, 15 insertions, 3 deletions
diff --git a/libstdc++-v3/libsupc++/eh_ptr.cc b/libstdc++-v3/libsupc++/eh_ptr.cc index bbe5f8f13f9..8d5a1b9b295 100644 --- a/libstdc++-v3/libsupc++/eh_ptr.cc +++ b/libstdc++-v3/libsupc++/eh_ptr.cc @@ -26,6 +26,8 @@ #ifdef _GLIBCXX_ATOMIC_BUILTINS_4 +#define _GLIBCXX_EH_PTR_COMPAT + #include <exception> #include <exception_ptr.h> #include "unwind-cxx.h" @@ -127,6 +129,7 @@ std::__exception_ptr::exception_ptr::swap(exception_ptr &other) throw() } +// Retained for compatibility with CXXABI_1.3. bool std::__exception_ptr::exception_ptr::operator!() const throw() { @@ -134,6 +137,7 @@ std::__exception_ptr::exception_ptr::operator!() const throw() } +// Retained for compatibility with CXXABI_1.3. std::__exception_ptr::exception_ptr::operator __safe_bool() const throw() { return _M_exception_object ? &exception_ptr::_M_safe_bool_dummy : 0; @@ -235,4 +239,6 @@ std::rethrow_exception(std::exception_ptr ep) std::terminate (); } +#undef _GLIBCXX_EH_PTR_COMPAT + #endif diff --git a/libstdc++-v3/libsupc++/exception_ptr.h b/libstdc++-v3/libsupc++/exception_ptr.h index 56997221f25..37f3132d7ae 100644 --- a/libstdc++-v3/libsupc++/exception_ptr.h +++ b/libstdc++-v3/libsupc++/exception_ptr.h @@ -77,10 +77,12 @@ namespace std namespace __exception_ptr { bool - operator==(const exception_ptr&, const exception_ptr&) throw() __attribute__ ((__pure__)); + operator==(const exception_ptr&, const exception_ptr&) + throw() __attribute__ ((__pure__)); bool - operator!=(const exception_ptr&, const exception_ptr&) throw() __attribute__ ((__pure__)); + operator!=(const exception_ptr&, const exception_ptr&) + throw() __attribute__ ((__pure__)); class exception_ptr { @@ -141,11 +143,15 @@ namespace std } #endif +#ifdef _GLIBCXX_EH_PTR_COMPAT + // Retained for compatibility with CXXABI_1.3. bool operator!() const throw() __attribute__ ((__pure__)); operator __safe_bool() const throw(); +#endif friend bool - operator==(const exception_ptr&, const exception_ptr&) throw() __attribute__ ((__pure__)); + operator==(const exception_ptr&, const exception_ptr&) + throw() __attribute__ ((__pure__)); const type_info* __cxa_exception_type() const throw() __attribute__ ((__pure__)); |