diff options
Diffstat (limited to 'contrib/libstdc++/src/ext-inst.cc')
-rw-r--r-- | contrib/libstdc++/src/ext-inst.cc | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/contrib/libstdc++/src/ext-inst.cc b/contrib/libstdc++/src/ext-inst.cc index 4896b11..4be3fed6 100644 --- a/contrib/libstdc++/src/ext-inst.cc +++ b/contrib/libstdc++/src/ext-inst.cc @@ -1,6 +1,6 @@ // Explicit instantiation file. -// Copyright (C) 2001, 2002 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2004 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 @@ -34,11 +34,18 @@ #include <ext/rope> #include <ext/stdio_filebuf.h> +namespace __gnu_internal +{ + const int min_len = __gnu_cxx::_Rope_constants::_S_max_rope_depth + 1; +} + namespace __gnu_cxx { + using namespace __gnu_internal; + template const unsigned long - rope<char, std::allocator<char> >::_S_min_len; + rope<char, std::allocator<char> >::_S_min_len[min_len]; template char @@ -47,10 +54,10 @@ namespace __gnu_cxx template class stdio_filebuf<char>; -#ifdef _GLIBCPP_USE_WCHAR_T +#ifdef _GLIBCXX_USE_WCHAR_T template - const unsigned long - rope<wchar_t, std::allocator<wchar_t> >::_S_min_len; + const unsigned long + rope<wchar_t, std::allocator<wchar_t> >::_S_min_len[min_len]; template wchar_t |