Remove extra blank line.

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

diff --git a/libstdc++-v3/libsupc++/cxxabi.h b/libstdc++-v3/libsupc++/cxxabi.h
index dfed54e..e7b2857 100644 (file)
--- a/libstdc++-v3/libsupc++/cxxabi.h
+++ b/libstdc++-v3/libsupc++/cxxabi.h
@@ -16,8 +16,8 @@
 // 
 // You should have received a copy of the GNU General Public License
 // along with GCC; see the file COPYING.  If not, write to
-// the Free Software Foundation, 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
+// the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+// Boston, MA 02110-1301, USA.
 
 // As a special exception, you may use this file as part of a free software
 // library without restriction.  Specifically, if other files instantiate
@@ -39,6 +39,10 @@
    is includable from both C and C++. Though the C++ specific parts are not
    available in C, naturally enough.  */
 
+/** @file cxxabi.h
+ *  The header provides an interface to the C++ ABI.
+ */
+
 #ifndef _CXXABI_H
 #define _CXXABI_H 1
 
@@ -50,6 +54,8 @@
 #ifdef __cplusplus
 namespace __cxxabiv1
 {  
+  typedef __cxa_cdtor_return_type (*__cxa_cdtor_type)(void *);
+
   extern "C" 
   {
 #endif
@@ -57,54 +63,55 @@ namespace __cxxabiv1
   // Allocate array.
   void* 
   __cxa_vec_new(size_t __element_count, size_t __element_size, 
-               size_t __padding_size, void (*__constructor) (void*),
-               void (*__destructor) (void*));
+               size_t __padding_size, __cxa_cdtor_type constructor,
+               __cxa_cdtor_type destructor);
 
   void*
   __cxa_vec_new2(size_t __element_count, size_t __element_size,
-                size_t __padding_size, void (*__constructor) (void*),
-                void (*__destructor) (void*), void *(*__alloc) (size_t), 
+                size_t __padding_size, __cxa_cdtor_type constructor,
+                __cxa_cdtor_type destructor, void *(*__alloc) (size_t), 
                 void (*__dealloc) (void*));
 
   void*
   __cxa_vec_new3(size_t __element_count, size_t __element_size,
-                size_t __padding_size, void (*__constructor) (void*),
-                void (*__destructor) (void*), void *(*__alloc) (size_t), 
+                size_t __padding_size, __cxa_cdtor_type constructor,
+                __cxa_cdtor_type destructor, void *(*__alloc) (size_t), 
                 void (*__dealloc) (void*, size_t));
 
   // Construct array.
   __cxa_vec_ctor_return_type
   __cxa_vec_ctor(void* __array_address, size_t __element_count,
-                size_t __element_size, void (*__constructor) (void*),
-                void (*__destructor) (void*));
+                size_t __element_size, __cxa_cdtor_type constructor,
+                __cxa_cdtor_type destructor);
 
   __cxa_vec_ctor_return_type
   __cxa_vec_cctor(void* dest_array, void* src_array, size_t element_count, 
-                 size_t element_size, void (*constructor) (void*, void*), 
-                 void (*destructor) (void*));
+                 size_t element_size, 
+                 __cxa_cdtor_return_type (*constructor) (void*, void*), 
+                 __cxa_cdtor_type destructor);
  
   // Destruct array.
   void 
   __cxa_vec_dtor(void* __array_address, size_t __element_count,
-                size_t __element_size, void (*__destructor) (void*));
+                size_t __element_size, __cxa_cdtor_type destructor);
   
   void 
   __cxa_vec_cleanup(void* __array_address, size_t __element_count,
-                   size_t __element_size, void (*__destructor) (void*));
+                   size_t __element_size, __cxa_cdtor_type destructor);
   
   // Destruct and release array.
   void 
   __cxa_vec_delete(void* __array_address, size_t __element_size,
-                  size_t __padding_size, void (*__destructor) (void*));
+                  size_t __padding_size, __cxa_cdtor_type destructor);
 
   void 
   __cxa_vec_delete2(void* __array_address, size_t __element_size,
-                   size_t __padding_size, void (*__destructor) (void*),
+                   size_t __padding_size, __cxa_cdtor_type destructor,
                    void (*__dealloc) (void*));
                   
   void 
   __cxa_vec_delete3(void* __array_address, size_t __element_size,
-                   size_t __padding_size, void (*__destructor) (void*),
+                   size_t __padding_size, __cxa_cdtor_type destructor,
                    void (*__dealloc) (void*, size_t));
 
   int 
@@ -460,7 +467,7 @@ namespace __cxxabiv1
   {
   public:
     unsigned int               __flags;  // Details about the class hierarchy.
-    unsigned int               __base_count;  // Dumber of direct bases.
+    unsigned int               __base_count;  // Number of direct bases.
 
     // The array of bases uses the trailing array struct hack so this
     // class is not constructable with a normal constructor. It is