git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* libsupc++/exception_ptr.h: Fix compilation in C++0x mode. 

From-SVN: r174075
This commit is contained in:
Jason Merrill 2011-05-23 11:39:48 -04:00 committed by Jason Merrill
parent e1caba18c8
commit dbee8bb3da
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libstdc++-v3/ChangeLog
View File

@ -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> 2011-05-22 Jonathan Wakely <jwakely.gcc@gmail.com>
* testsuite/20_util/bind/cv_quals_2.cc: New. * testsuite/20_util/bind/cv_quals_2.cc: New.

4
libstdc++-v3/libsupc++/exception_ptr.h
View File

@ -97,7 +97,9 @@ namespace std
exception_ptr(exception_ptr&& __o) throw() exception_ptr(exception_ptr&& __o) throw()
: _M_exception_object(__o._M_exception_object) : _M_exception_object(__o._M_exception_object)
{ __o._M_exception_object = 0; } { __o._M_exception_object = 0; }
#else #endif
#if !defined (__GXX_EXPERIMENTAL_CXX0X__) || defined (_GLIBCXX_EH_PTR_COMPAT)
typedef void (exception_ptr::*__safe_bool)(); typedef void (exception_ptr::*__safe_bool)();
// For construction from nullptr or 0. // For construction from nullptr or 0.