From 7865836f4b0f698454c31b4593effcb032c22c1e Mon Sep 17 00:00:00 2001
From: kan <kan@FreeBSD.org>
Date: Sat, 19 May 2007 01:25:07 +0000
Subject: GCC 4.2.0 release C++ standard library and runtime support code.

---
 contrib/libstdc++/src/fstream-inst.cc | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

(limited to 'contrib/libstdc++/src/fstream-inst.cc')

diff --git a/contrib/libstdc++/src/fstream-inst.cc b/contrib/libstdc++/src/fstream-inst.cc
index 4d9eae5..762ccb8 100644
--- a/contrib/libstdc++/src/fstream-inst.cc
+++ b/contrib/libstdc++/src/fstream-inst.cc
@@ -1,6 +1,6 @@
 // Explicit instantiation file.
 
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2005
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -16,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
@@ -34,29 +34,18 @@
 
 #include <fstream>
 
-namespace std
-{
-  // filebuf
-  template class basic_filebuf<char, char_traits<char> >;
-#ifdef _GLIBCXX_USE_WCHAR_T
-  template class basic_filebuf<wchar_t, char_traits<wchar_t> >;
-#endif
+_GLIBCXX_BEGIN_NAMESPACE(std)
 
-  // ifstream
+  template class basic_filebuf<char, char_traits<char> >;
   template class basic_ifstream<char>;
-#ifdef _GLIBCXX_USE_WCHAR_T
-  template class basic_ifstream<wchar_t>;
-#endif
-
-  // ofstream
   template class basic_ofstream<char>;
-#ifdef _GLIBCXX_USE_WCHAR_T
-  template class basic_ofstream<wchar_t>;
-#endif
-
-  // fstream
   template class basic_fstream<char>;
+
 #ifdef _GLIBCXX_USE_WCHAR_T
+  template class basic_filebuf<wchar_t, char_traits<wchar_t> >;
+  template class basic_ifstream<wchar_t>;
+  template class basic_ofstream<wchar_t>;
   template class basic_fstream<wchar_t>;
 #endif
-} // namespace std
+
+_GLIBCXX_END_NAMESPACE
-- 
cgit v1.1