diff options
| author | Jason Merrill <jason@redhat.com> | 2011-05-23 11:39:48 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2011-05-23 11:39:48 -0400 |
| commit | dbee8bb3da264ebff80a3a3cdef017fbc0566467 (patch) | |
| tree | b52a26ca2186cb43721828e222ca49a4306f059d /libstdc++-v3 | |
| parent | e1caba18c8bbd93bd53e748c2f130ef0d75bbaa2 (diff) | |
| download | gcc-dbee8bb3da264ebff80a3a3cdef017fbc0566467.zip gcc-dbee8bb3da264ebff80a3a3cdef017fbc0566467.tar.gz gcc-dbee8bb3da264ebff80a3a3cdef017fbc0566467.tar.bz2 | |
* libsupc++/exception_ptr.h: Fix compilation in C++0x mode.
From-SVN: r174075
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
| -rw-r--r-- | libstdc++-v3/libsupc++/exception_ptr.h | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index f922fc5..6332eaa 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,7 @@ +2011-05-23 Jason Merrill <jason@redhat.com> + + * libsupc++/exception_ptr.h: Fix compilation in C++0x mode. + 2011-05-22 Jonathan Wakely <jwakely.gcc@gmail.com> * testsuite/20_util/bind/cv_quals_2.cc: New. diff --git a/libstdc++-v3/libsupc++/exception_ptr.h b/libstdc++-v3/libsupc++/exception_ptr.h index 26117cd..00b30fd 100644 --- a/libstdc++-v3/libsupc++/exception_ptr.h +++ b/libstdc++-v3/libsupc++/exception_ptr.h @@ -97,7 +97,9 @@ namespace std exception_ptr(exception_ptr&& __o) throw() : _M_exception_object(__o._M_exception_object) { __o._M_exception_object = 0; } -#else +#endif + +#if !defined (__GXX_EXPERIMENTAL_CXX0X__) || defined (_GLIBCXX_EH_PTR_COMPAT) typedef void (exception_ptr::*__safe_bool)(); // For construction from nullptr or 0. |