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

From-SVN: r174075

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index f922fc59cf7dc596c58edf84908c465ec84e6718..6332eaa090814678b44bd777ceb349af1d652cd5 100644 (file)
--- 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 26117cd5d095aa9fac4638b34798312e79300082..00b30fd398a1110db2e4ff88d2845595a79a0fb1 100644 (file)
--- 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.