diff options
Diffstat (limited to 'contrib/libstdc++/src/string-inst.cc')
| -rw-r--r-- | contrib/libstdc++/src/string-inst.cc | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/contrib/libstdc++/src/string-inst.cc b/contrib/libstdc++/src/string-inst.cc index e01dbca..c17862b 100644 --- a/contrib/libstdc++/src/string-inst.cc +++ b/contrib/libstdc++/src/string-inst.cc @@ -1,6 +1,6 @@ // Components for manipulating sequences of characters -*- C++ -*- -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 // 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 @@ -42,8 +42,8 @@ # define C char #endif -namespace std -{ +_GLIBCXX_BEGIN_NAMESPACE(std) + typedef basic_string<C> S; template class basic_string<C>; @@ -76,11 +76,13 @@ namespace std C* S::_S_construct(const C*, const C*, const allocator<C>&, forward_iterator_tag); -} // namespace std -namespace __gnu_cxx -{ +_GLIBCXX_END_NAMESPACE + +_GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) + using std::S; template bool operator==(const S::iterator&, const S::iterator&); template bool operator==(const S::const_iterator&, const S::const_iterator&); -} // namespace __gnu_cxx + +_GLIBCXX_END_NAMESPACE |
