diff options
| author | kan <kan@FreeBSD.org> | 2007-05-19 01:25:07 +0000 |
|---|---|---|
| committer | kan <kan@FreeBSD.org> | 2007-05-19 01:25:07 +0000 |
| commit | 7865836f4b0f698454c31b4593effcb032c22c1e (patch) | |
| tree | ea6c2718dc1e45ed535d194df808ef31f0ebac92 /contrib/libstdc++/libsupc++/eh_exception.cc | |
| parent | 1f9ea4d0a40cca64d60cf4dab152349da7b9dddf (diff) | |
| download | FreeBSD-src-7865836f4b0f698454c31b4593effcb032c22c1e.zip FreeBSD-src-7865836f4b0f698454c31b4593effcb032c22c1e.tar.gz | |
GCC 4.2.0 release C++ standard library and runtime support code.
Diffstat (limited to 'contrib/libstdc++/libsupc++/eh_exception.cc')
| -rw-r--r-- | contrib/libstdc++/libsupc++/eh_exception.cc | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/contrib/libstdc++/libsupc++/eh_exception.cc b/contrib/libstdc++/libsupc++/eh_exception.cc index 5efd1bc..40bb839 100644 --- a/contrib/libstdc++/libsupc++/eh_exception.cc +++ b/contrib/libstdc++/libsupc++/eh_exception.cc @@ -1,5 +1,6 @@ // -*- C++ -*- std::exception implementation. -// Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +// Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +// 2003, 2004, 2005, 2006, 2007 // Free Software Foundation // // This file is part of GCC. @@ -16,8 +17,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 @@ -28,7 +29,6 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. - #include "typeinfo" #include "exception" #include "unwind-cxx.h" @@ -40,5 +40,14 @@ std::bad_exception::~bad_exception() throw() { } const char* std::exception::what() const throw() { - return typeid (*this).name (); + // NB: Another elegant option would be returning typeid(*this).name() + // and not overriding what() in bad_exception, bad_alloc, etc. In + // that case, however, mangled names would be returned, PR 14493. + return "std::exception"; +} + +const char* +std::bad_exception::what() const throw() +{ + return "std::bad_exception"; } |
