X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=libstdc%2B%2B-v3%2Fsrc%2Fext-inst.cc;fp=libstdc%2B%2B-v3%2Fsrc%2Fext-inst.cc;h=ae942c78d43252ba329ca1efdf1f1f706a610420;hb=6fed43773c9b0ce596dca5686f37ac3fc0fa11c0;hp=4896b110d42b8cbdd6959661ff23c1ed53a8ed05;hpb=27b11d56b743098deb193d510b337ba22dc52e5c;p=msp430-gcc.git
diff --git a/libstdc++-v3/src/ext-inst.cc b/libstdc++-v3/src/ext-inst.cc
index 4896b110..ae942c78 100644
--- a/libstdc++-v3/src/ext-inst.cc
+++ b/libstdc++-v3/src/ext-inst.cc
@@ -1,11 +1,11 @@
// Explicit instantiation file.
-// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2002, 2004, 2006, 2009 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
// 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,19 +13,14 @@
// 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
+// .
//
// ISO C++ 14882:
@@ -34,11 +29,16 @@
#include
#include
-namespace __gnu_cxx
-{
+_GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
+
+ namespace
+ {
+ const int min_len = __detail::_S_max_rope_depth + 1;
+ }
+
template
const unsigned long
- rope >::_S_min_len;
+ rope >::_S_min_len[min_len];
template
char
@@ -47,10 +47,10 @@ namespace __gnu_cxx
template class stdio_filebuf;
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
template
- const unsigned long
- rope >::_S_min_len;
+ const unsigned long
+ rope >::_S_min_len[min_len];
template
wchar_t
@@ -59,4 +59,5 @@ namespace __gnu_cxx
template class stdio_filebuf;
#endif
-} // namespace __gnu_cxx
+
+_GLIBCXX_END_NAMESPACE