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

From-SVN: r174075

* libsupc++/exception_ptr.h: Fix compilation in C++0x mode.
From-SVN: r174075
dbee8bb3 · Jason Merrill · Jason Merrill · e1caba18 · dbee8bb3 · dbee8bb3
Commit dbee8bb3 authored May 23, 2011 by Jason Merrill Committed by Jason Merrill May 23, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletions

libstdc++-v3/ChangeLog
+4 -0

libstdc++-v3/libsupc++/exception_ptr.h
+3 -1

No files found.
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
+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.

--- 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.