GCC 4.2.0 release C++ standard library and runtime support code.

1 files changed, 6 insertions, 15 deletions

diff --git a/contrib/libstdc++/src/allocator-inst.cc b/contrib/libstdc++/src/allocator-inst.cc
index 40d7049..aca019c 100644
--- a/contrib/libstdc++/src/allocator-inst.cc
+++ b/contrib/libstdc++/src/allocator-inst.cc
@@ -1,6 +1,7 @@
 // Explicit instantiation file.
 
-// Copyright (C) 1999, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005
+// Free Software Foundation, Inc.
 //
 // 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
@@ -15,7 +16,7 @@
 
 // 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,
+// 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
@@ -32,20 +33,10 @@
 //
 
 #include <memory>
-#include <ext/mt_allocator.h>
-#include <ext/pool_allocator.h>
 
-namespace std
-{
+_GLIBCXX_BEGIN_NAMESPACE(std)
+
   template class allocator<char>;
   template class allocator<wchar_t>;
-} // namespace std
-
-namespace __gnu_cxx
-{
-  template class __mt_alloc<char>;
-  template class __mt_alloc<wchar_t>;
 
-  template class __pool_alloc<char>;
-  template class __pool_alloc<wchar_t>;
-} // namespace __gnu_cxx
+_GLIBCXX_END_NAMESPACE