diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-03-06 20:36:03 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-03-06 20:36:03 +0000 |
| commit | e4ab123c32e6ee2064f01f5bb477bfaca438c20f (patch) | |
| tree | 45c6c5ff8fa819ab554de69d49403a43f8de5ecb /libstdc++-v3/include/bits/streambuf.tcc | |
| parent | 692323c3112b3b579a1634758842ede7c416f94c (diff) | |
| download | gcc-e4ab123c32e6ee2064f01f5bb477bfaca438c20f.tar.gz | |
2011-03-06 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 170715 using svnmerge
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@170721 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/bits/streambuf.tcc')
| -rw-r--r-- | libstdc++-v3/include/bits/streambuf.tcc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libstdc++-v3/include/bits/streambuf.tcc b/libstdc++-v3/include/bits/streambuf.tcc index 253f308dc88..6cb85fc1818 100644 --- a/libstdc++-v3/include/bits/streambuf.tcc +++ b/libstdc++-v3/include/bits/streambuf.tcc @@ -1,7 +1,7 @@ // Stream buffer classes -*- C++ -*- // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, -// 2006, 2009, 2010 Free Software Foundation, Inc. +// 2006, 2007, 2008, 2009, 2010, 2011 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 @@ -57,7 +57,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION traits_type::copy(__s, this->gptr(), __len); __ret += __len; __s += __len; - this->gbump(__len); + this->__safe_gbump(__len); } if (__ret < __n) @@ -91,7 +91,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION traits_type::copy(this->pptr(), __s, __len); __ret += __len; __s += __len; - this->pbump(__len); + this->__safe_pbump(__len); } if (__ret < __n) @@ -146,7 +146,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // Inhibit implicit instantiations for required instantiations, // which are defined via explicit instantiations elsewhere. - // NB: This syntax is a GNU extension. #if _GLIBCXX_EXTERN_TEMPLATE extern template class basic_streambuf<char>; extern template @@ -172,6 +171,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #endif _GLIBCXX_END_NAMESPACE_VERSION -} // namespace +} // namespace std #endif |