This is the mail archive of the
libstdc++@gcc.gnu.org
mailing list for the libstdc++ project.
[PATCH] Undo 2001-11-30 libsupc++ changes
- From: Paolo Carlini <pcarlini at unitus dot it>
- To: libstdc++ at gcc dot gnu dot org
- Cc: bkoz at redhat dot com, jason at redhat dot com, ncm at cantrip dot org
- Date: Sat, 05 Jan 2002 18:18:35 +0100
- Subject: [PATCH] Undo 2001-11-30 libsupc++ changes
Hi,
this patch (bootstrapped, full regression tested c,c++ on i686-pc-linux-gnu)
undoes 2001-11-30 changes to libsupc++ as per Jason's request
(http://gcc.gnu.org/ml/libstdc++/2002-01/msg00090.html)
Ok to commit?
Cheers,
Paolo.
///////////////
2002-01-05 Paolo Carlini <pcarlini@unitus.it>
libstdc++/3150: undo 2001-11-30 commit, as per
http://gcc.gnu.org/ml/libstdc++/2002-01/msg00090.html
* libsupc++/exception (bad_exception::~bad_exception()):
Reintroduce declaration; adjust copyright years.
* libsupc++/new (bad_alloc::~bad_alloc()): Same.
* libsupc++/typeinfo (bad_cast::~bad_cast()): Same.
(bad_typeid::~bad_typeid()): Reintroduce declaration.
* libsupc++/eh_exception.cc (bad_exception::~bad_exception()):
Reintroduce definition; adjust copyright years.
* libsupc++/new_handler.cc (bad_alloc::~bad_alloc()): Same.
* libsupc++/tinfo.cc (bad_cast::~bad_cast()): Same.
(bad_typeid::~bad_typeid()): Reintroduce definition.
diff -urN libstdc++-v3/libsupc++/eh_exception.cc
libstdc++-v3-new/libsupc++/eh_exception.cc
--- libstdc++-v3/libsupc++/eh_exception.cc Sat Dec 1 05:56:03 2001
+++ libstdc++-v3-new/libsupc++/eh_exception.cc Sat Jan 5 12:36:43 2002
@@ -1,5 +1,5 @@
// -*- C++ -*- std::exception implementation.
-// Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+// Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
// Free Software Foundation
//
// This file is part of GNU CC.
@@ -34,6 +34,8 @@
#include "unwind-cxx.h"
std::exception::~exception() throw() { }
+
+std::bad_exception::~bad_exception() throw() { }
const char*
std::exception::what() const throw()
diff -urN libstdc++-v3/libsupc++/exception libstdc++-v3-new/libsupc++/exception
--- libstdc++-v3/libsupc++/exception Sat Dec 1 05:56:03 2001
+++ libstdc++-v3-new/libsupc++/exception Sat Jan 5 12:37:10 2002
@@ -1,6 +1,7 @@
// Exception Handling support header for -*- C++ -*-
-// Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001 Free Software Foundation
+// Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002
+// Free Software Foundation
//
// This file is part of GNU CC.
//
@@ -62,6 +63,7 @@
{
public:
bad_exception() throw() { }
+ virtual ~bad_exception() throw();
};
/// If you write a replacement %terminate handler, it must be of this type.
diff -urN libstdc++-v3/libsupc++/new libstdc++-v3-new/libsupc++/new
--- libstdc++-v3/libsupc++/new Sat Dec 1 05:56:03 2001
+++ libstdc++-v3-new/libsupc++/new Sat Jan 5 12:37:32 2002
@@ -1,6 +1,7 @@
// The -*- C++ -*- dynamic memory management header.
-// Copyright (C) 1994, 1996, 1997, 1998, 2000, 2001 Free Software Foundation
+// Copyright (C) 1994, 1996, 1997, 1998, 2000, 2001, 2002
+// Free Software Foundation
// This file is part of GNU CC.
//
@@ -50,6 +51,7 @@
{
public:
bad_alloc() throw() { }
+ virtual ~bad_alloc() throw();
};
struct nothrow_t { };
diff -urN libstdc++-v3/libsupc++/new_handler.cc
libstdc++-v3-new/libsupc++/new_handler.cc
--- libstdc++-v3/libsupc++/new_handler.cc Sat Dec 1 05:56:03 2001
+++ libstdc++-v3-new/libsupc++/new_handler.cc Sat Jan 5 12:38:02 2002
@@ -1,6 +1,7 @@
// Implementation file for the -*- C++ -*- dynamic memory management header.
-// Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation
+// Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002
+// Free Software Foundation
//
// This file is part of GNU CC.
//
@@ -42,3 +43,5 @@
__new_handler = handler;
return prev_handler;
}
+
+std::bad_alloc::~bad_alloc() throw() { }
diff -urN libstdc++-v3/libsupc++/tinfo.cc libstdc++-v3-new/libsupc++/tinfo.cc
--- libstdc++-v3/libsupc++/tinfo.cc Sat Dec 1 05:56:03 2001
+++ libstdc++-v3-new/libsupc++/tinfo.cc Sat Jan 5 12:38:20 2002
@@ -1,5 +1,6 @@
// Methods for type_info for -*- C++ -*- Run Time Type Identification.
-// Copyright (C) 1994, 1996, 1998, 1999, 2000, 2001 Free Software Foundation
+// Copyright (C) 1994, 1996, 1998, 1999, 2000, 2001, 2002
+// Free Software Foundation
//
// This file is part of GNU CC.
//
@@ -38,6 +39,9 @@
std::type_info::
~type_info ()
{ }
+
+std::bad_cast::~bad_cast() throw() { }
+std::bad_typeid::~bad_typeid() throw() { }
#if !__GXX_MERGED_TYPEINFO_NAMES
diff -urN libstdc++-v3/libsupc++/typeinfo libstdc++-v3-new/libsupc++/typeinfo
--- libstdc++-v3/libsupc++/typeinfo Sat Dec 1 05:56:03 2001
+++ libstdc++-v3-new/libsupc++/typeinfo Sat Jan 5 12:38:37 2002
@@ -1,5 +1,6 @@
// RTTI support for -*- C++ -*-
-// Copyright (C) 1994, 1995, 1996, 1997, 1998, 2000, 2001 Free Software
Foundation
+// Copyright (C) 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002
+// Free Software Foundation
//
// This file is part of GNU CC.
//
@@ -129,6 +130,7 @@
{
public:
bad_cast() throw() { }
+ virtual ~bad_cast() throw();
};
/** If you use a NULL pointer in a @c typeid expression, this is thrown. */
@@ -136,6 +138,7 @@
{
public:
bad_typeid () throw() { }
+ virtual ~bad_typeid() throw();
};
} // namespace std