2009-02-20 Benjamin Kosnik <bkoz@redhat.com>

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

diff --git a/libstdc++-v3/libsupc++/exception b/libstdc++-v3/libsupc++/exception
index 2046300..37c5f7b 100644 (file)
--- a/libstdc++-v3/libsupc++/exception
+++ b/libstdc++-v3/libsupc++/exception
@@ -1,7 +1,7 @@
 // Exception Handling support header for -*- C++ -*-
 
 // Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-// 2004, 2005, 2006, 2007
+// 2004, 2005, 2006, 2007, 2008, 2009
 // Free Software Foundation
 //
 // This file is part of GCC.
@@ -46,6 +46,14 @@ extern "C++" {
 namespace std 
 {
   /**
+   * @defgroup exceptions Exceptions
+   * @ingroup diagnostics
+   *
+   * Classes and functions for reporting errors via exception classes.
+   * @{
+   */
+
+  /**
    *  @brief Base class for all library exceptions.
    *
    *  This is the base class for all exceptions thrown by the standard
@@ -58,6 +66,7 @@ namespace std
   public:
     exception() throw() { }
     virtual ~exception() throw();
+
     /** Returns a C-style character string describing the general cause
      *  of the current error.  */
     virtual const char* what() const throw();
@@ -69,26 +78,31 @@ namespace std
   {
   public:
     bad_exception() throw() { }
+
     // This declaration is not useless:
     // http://gcc.gnu.org/onlinedocs/gcc-3.0.2/gcc_6.html#SEC118
     virtual ~bad_exception() throw();
+
     // See comment in eh_exception.cc.
     virtual const char* what() const throw();
   };
 
   /// If you write a replacement %terminate handler, it must be of this type.
   typedef void (*terminate_handler) ();
+
   /// If you write a replacement %unexpected handler, it must be of this type.
   typedef void (*unexpected_handler) ();
 
   /// Takes a new handler function as an argument, returns the old function.
   terminate_handler set_terminate(terminate_handler) throw();
+
   /** The runtime will call this function if %exception handling must be
    *  abandoned for any reason.  It can also be called by the user.  */
   void terminate() __attribute__ ((__noreturn__));
 
   /// Takes a new handler function as an argument, returns the old function.
   unexpected_handler set_unexpected(unexpected_handler) throw();
+
   /** The runtime will call this function if an %exception is thrown which
    *  violates the function's %exception specification.  */
   void unexpected() __attribute__ ((__noreturn__));
@@ -104,21 +118,29 @@ namespace std
    *  result in a call of @c terminate() (15.5.1)."
    */
   bool uncaught_exception() throw();
+
+  // @} group exceptions
 } // namespace std
 
 _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
 
-  /** A replacement for the standard terminate_handler which prints more
-      information about the terminating exception (if any) on stderr.  Call
-      @code
-        std::set_terminate (__gnu_cxx::__verbose_terminate_handler)
-      @endcode
-      to use.  For more info, see
-      http://gcc.gnu.org/onlinedocs/libstdc++/19_diagnostics/howto.html#4
-
-      In 3.4 and later, this is on by default.
-  */
-  void __verbose_terminate_handler ();
+  /** 
+   *  @brief A replacement for the standard terminate_handler which
+   *  prints more information about the terminating exception (if any)
+   *  on stderr.  
+   *
+   *  @ingroup exceptions
+   *
+   *  Call
+   *   @code
+   *     std::set_terminate(__gnu_cxx::__verbose_terminate_handler)
+   *   @endcode
+   *  to use.  For more info, see
+   *  http://gcc.gnu.org/onlinedocs/libstdc++/manual/bk01pt02ch06s02.html
+   *
+   *  In 3.4 and later, this is on by default.
+   */
+  void __verbose_terminate_handler();
 
 _GLIBCXX_END_NAMESPACE
   
@@ -126,4 +148,9 @@ _GLIBCXX_END_NAMESPACE
 
 #pragma GCC visibility pop
 
+#if (defined(__GXX_EXPERIMENTAL_CXX0X__) \
+     && defined(_GLIBCXX_ATOMIC_BUILTINS_4))
+#include <exception_ptr.h>
+#endif
+
 #endif