2012-04-16 Bernhard Reutner-Fischer <aldot@gcc.gnu.org>

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

diff --git a/libstdc++-v3/libsupc++/vterminate.cc b/libstdc++-v3/libsupc++/vterminate.cc
index 8ec4897..96824bb 100644 (file)
--- a/libstdc++-v3/libsupc++/vterminate.cc
+++ b/libstdc++-v3/libsupc++/vterminate.cc
@@ -1,11 +1,11 @@
 // Verbose terminate_handler -*- C++ -*-
 
-// Copyright (C) 2001, 2002, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2004, 2005, 2009, 2011 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
 // terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
+// Free Software Foundation; either version 3, or (at your option)
 // any later version.
 
 // This library is distributed in the hope that it will be useful,
@@ -13,25 +13,21 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
 
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+// <http://www.gnu.org/licenses/>.
 
 #include <bits/c++config.h>
+
 #if _GLIBCXX_HOSTED
 #include <cstdlib>
 #include <exception>
-#include <exception_defines.h>
+#include <bits/exception_defines.h>
 #include <cxxabi.h>
 # include <cstdio>
 
@@ -40,6 +36,8 @@ using namespace abi;
 
 namespace __gnu_cxx
 {
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
   // A replacement for the standard terminate_handler which prints
   // more information about the terminating exception (if any) on
   // stderr.
@@ -79,9 +77,9 @@ namespace __gnu_cxx
 
        // If the exception is derived from std::exception, we can
        // give more information.
-       try { __throw_exception_again; }
+       __try { __throw_exception_again; }
 #ifdef __EXCEPTIONS
-       catch (exception &exc)
+       __catch(const exception& exc)
          {
            char const *w = exc.what();
            fputs("  what():  ", stderr);
@@ -89,12 +87,15 @@ namespace __gnu_cxx
            fputs("\n", stderr);
           }
 #endif
-       catch (...) { }
+       __catch(...) { }
       }
     else
       fputs("terminate called without an active exception\n", stderr);
     
     abort();
   }
-} // namespace __gnu_cxx
+
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace
+
 #endif