2010-11-18 Benjamin Kosnik <bkoz@redhat.com>

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / libsupc++ / exception_ptr.h

diff --git a/libstdc++-v3/libsupc++/exception_ptr.h b/libstdc++-v3/libsupc++/exception_ptr.h
index 37f3132..c0316fd 100644 (file)
--- a/libstdc++-v3/libsupc++/exception_ptr.h
+++ b/libstdc++-v3/libsupc++/exception_ptr.h
@@ -24,8 +24,8 @@
 // <http://www.gnu.org/licenses/>.
 
 /** @file exception_ptr.h
- *  This is an internal header file, included by other headers and the
- *  implementation. You should not attempt to use it directly.
+ *  This is an internal header file, included by other library headers.
+ *  Do not attempt to use it directly. @headername{exception}
  */
 
 #ifndef _EXCEPTION_PTR_H
@@ -48,42 +48,28 @@ namespace std
    * @addtogroup exceptions
    * @{
    */
-
-  // Hide the free operators from other types
   namespace __exception_ptr
   {
-    /**
-     * @brief An opaque pointer to an arbitrary exception.
-     */
     class exception_ptr;
   }
 
   using __exception_ptr::exception_ptr;
 
-  /** Obtain an %exception_ptr to the currently handled exception. If there
+  /** Obtain an exception_ptr to the currently handled exception. If there
    *  is none, or the currently handled exception is foreign, return the null
    *  value.
    */
   exception_ptr current_exception() throw();
 
-  /// Throw the object pointed to by the %exception_ptr.
+  /// Throw the object pointed to by the exception_ptr.
   void rethrow_exception(exception_ptr) __attribute__ ((__noreturn__));
 
-  /// Obtain an %exception_ptr pointing to a copy of the supplied object.
-  template<typename _Ex>
-    exception_ptr 
-    copy_exception(_Ex __ex) throw();
-
   namespace __exception_ptr
   {
-    bool 
-    operator==(const exception_ptr&, const exception_ptr&)
-      throw() __attribute__ ((__pure__));
-
-    bool 
-    operator!=(const exception_ptr&, const exception_ptr&)
-      throw() __attribute__ ((__pure__));
-
+    /**
+     *  @brief An opaque pointer to an arbitrary exception.
+     *  @ingroup exceptions
+     */
     class exception_ptr
     {
       void* _M_exception_object;
@@ -95,25 +81,27 @@ namespace std
 
       void *_M_get() const throw() __attribute__ ((__pure__));
 
-      void _M_safe_bool_dummy() throw() __attribute__ ((__const__));
-
       friend exception_ptr std::current_exception() throw();
       friend void std::rethrow_exception(exception_ptr);
 
     public:
       exception_ptr() throw();
 
-      typedef void (exception_ptr::*__safe_bool)();
-
-      // For construction from nullptr or 0.
-      exception_ptr(__safe_bool) throw();
-
       exception_ptr(const exception_ptr&) throw();
 
 #ifdef __GXX_EXPERIMENTAL_CXX0X__
+      exception_ptr(nullptr_t) throw()
+      : _M_exception_object(0)
+      { }
+
       exception_ptr(exception_ptr&& __o) throw()
       : _M_exception_object(__o._M_exception_object)
       { __o._M_exception_object = 0; }
+#else
+      typedef void (exception_ptr::*__safe_bool)();
+
+      // For construction from nullptr or 0.
+      exception_ptr(__safe_bool) throw();
 #endif
 
       exception_ptr& 
@@ -123,7 +111,7 @@ namespace std
       exception_ptr& 
       operator=(exception_ptr&& __o) throw()
       {
-        exception_ptr(__o).swap(*this);
+        exception_ptr(static_cast<exception_ptr&&>(__o)).swap(*this);
         return *this;
       }
 #endif
@@ -133,47 +121,66 @@ namespace std
       void 
       swap(exception_ptr&) throw();
 
-#ifdef __GXX_EXPERIMENTAL_CXX0X__
-      void 
-      swap(exception_ptr &&__o) throw()
-      {
-        void *__tmp = _M_exception_object;
-        _M_exception_object = __o._M_exception_object;
-        __o._M_exception_object = __tmp;
-      }
-#endif
-
 #ifdef _GLIBCXX_EH_PTR_COMPAT
       // Retained for compatibility with CXXABI_1.3.
+      void _M_safe_bool_dummy() throw() __attribute__ ((__const__));
       bool operator!() const throw() __attribute__ ((__pure__));
       operator __safe_bool() const throw();
 #endif
 
+#ifdef __GXX_EXPERIMENTAL_CXX0X__
+      explicit operator bool() const
+      { return _M_exception_object; }
+#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__));
     };
 
+    bool 
+    operator==(const exception_ptr&, const exception_ptr&) throw() 
+    __attribute__ ((__pure__));
+
+    bool 
+    operator!=(const exception_ptr&, const exception_ptr&) throw() 
+    __attribute__ ((__pure__));
+
+    inline void
+    swap(exception_ptr& __lhs, exception_ptr& __rhs)
+    { __lhs.swap(__rhs); }
+
   } // namespace __exception_ptr
 
 
+  /// Obtain an exception_ptr pointing to a copy of the supplied object.
   template<typename _Ex>
     exception_ptr 
     copy_exception(_Ex __ex) throw()
     {
       __try
        {
+#ifdef __EXCEPTIONS
          throw __ex;
+#endif
        }
       __catch(...)
        {
-         return current_exception ();
+         return current_exception();
        }
     }
 
+  // _GLIBCXX_RESOLVE_LIB_DEFECTS
+  // 1130. copy_exception name misleading
+  /// Obtain an exception_ptr pointing to a copy of the supplied object.
+  template<typename _Ex>
+    exception_ptr 
+    make_exception_ptr(_Ex __ex) throw()
+    { return std::copy_exception<_Ex>(__ex); }
+
   // @} group exceptions
 } // namespace std