12ffa22844
2011-01-30 Benjamin Kosnik <bkoz@redhat.com> PR libstdc++/36104 part four * include/bits/c++config (_GLIBCXX_STD): Remove. (_GLIBCXX_STD_D, _GLIBCXX_PR): Now _GLIBCXX_STD_C. (_GLIBCXX_P): Now _GLIBCXX_STD_A. (_GLIBCXX_NAMESPACE_DEBUG, _GLIBCXX_NAMESPACE_PARALLEL, _GLIBCXX_NAMESPACE_PROFILE, _GLIBCXX_NAMESPACE_VERSION): Remove. (_GLIBCXX_INLINE_DEBUG, _GLIBCXX_INLINE_PARALLEL, _GLIBCXX_INLINE_PROFILE): Remove. (_GLIBCXX_BEGIN_NAMESPACE(X)): Remove. (_GLIBCXX_END_NAMESPACE): Remove. (_GLIBCXX_BEGIN_NESTED_NAMESPACE(X, Y)): Remove. (_GLIBCXX_END_NESTED_NAMESPACE): Remove. (_GLIBCXX_BEGIN_NAMESPACE_ALGO): Add. (_GLIBCXX_END_NAMESPACE_ALGO): Add. (_GLIBCXX_BEGIN_NAMESPACE_CONTAINER): Add. (_GLIBCXX_END_NAMESPACE_CONTAINER): Add. (_GLIBCXX_BEGIN_NAMESPACE_VERSION): Add. (_GLIBCXX_END_NAMESPACE_VERSION): Add. (_GLIBCXX_BEGIN_LDBL_NAMESPACE): To _GLIBCXX_BEGIN_NAMESPACE_LDBL. (_GLIBCXX_END_LDBL_NAMESPACE): To _GLIBCXX_END_NAMESPACE_LDBL. (_GLIBCXX_VISIBILITY_ATTR): Revert to _GLIBCXX_VISIBILITY. * include/*: Use new macros for namespace scope. * config/*: Same. * src/*: Same. * src/Makefile.am (sources): Remove debug_list.cc, add compatibility-debug_list-2.cc. (parallel_sources): Remove parallel_list.cc, add compatibility-parallel_list-2.cc. (compatibility-parallel_list-2.[o,lo]): New rule. * src/Makefile.in: Regenerate. * src/debug_list.cc: Remove. * src/parallel_list.cc: Remove. * src/compatibility-list-2.cc: New. * src/compatibility-debug_list-2.cc: New. * src/compatibility-parallel_list-2.cc: New. * doc/doxygen/user.cfg.in: Adjust macros. * testsuite/20_util/auto_ptr/assign_neg.cc: Adjust line numbers, macros. * testsuite/20_util/declval/requirements/1_neg.cc: Same. * testsuite/20_util/duration/requirements/typedefs_neg1.cc: Same. * testsuite/20_util/duration/requirements/typedefs_neg2.cc: Same. * testsuite/20_util/duration/requirements/typedefs_neg3.cc: Same. * testsuite/20_util/forward/c_neg.cc: Same. * testsuite/20_util/forward/f_neg.cc: Same. * testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Same. * testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc: Same. * testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Same. * testsuite/20_util/ratio/operations/ops_overflow_neg.cc: Same. * testsuite/20_util/shared_ptr/cons/43820_neg.cc: Same. * testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Same. * testsuite/23_containers/deque/requirements/dr438/assign_neg.cc: Same. * testsuite/23_containers/deque/requirements/dr438/ constructor_1_neg.cc: Same. * testsuite/23_containers/deque/requirements/dr438/ constructor_2_neg.cc: Same. * testsuite/23_containers/deque/requirements/dr438/insert_neg.cc: Same. * testsuite/23_containers/forward_list/capacity/1.cc: Same. * testsuite/23_containers/forward_list/requirements/dr438/ assign_neg.cc: Same. * testsuite/23_containers/forward_list/requirements/dr438/ constructor_1_neg.cc: Same. * testsuite/23_containers/forward_list/requirements/dr438/ constructor_2_neg.cc: Same. * testsuite/23_containers/forward_list/requirements/dr438/ insert_neg.cc: Same. * testsuite/23_containers/list/capacity/29134.cc: Same. * testsuite/23_containers/list/requirements/dr438/assign_neg.cc: Same. * testsuite/23_containers/list/requirements/dr438/ constructor_1_neg.cc: Same. * testsuite/23_containers/list/requirements/dr438/ constructor_2_neg.cc: Same. * testsuite/23_containers/list/requirements/dr438/insert_neg.cc: Same. * testsuite/23_containers/vector/bool/capacity/29134.cc: Same. * testsuite/23_containers/vector/bool/modifiers/insert/31370.cc: Same. * testsuite/23_containers/vector/requirements/dr438/assign_neg.cc: Same. * testsuite/23_containers/vector/requirements/dr438/ constructor_1_neg.cc: Same. * testsuite/23_containers/vector/requirements/dr438/ constructor_2_neg.cc: Same. * testsuite/23_containers/vector/requirements/dr438/insert_neg.cc: Same. * testsuite/25_algorithms/sort/35588.cc: Same. * testsuite/27_io/ios_base/cons/assign_neg.cc: Same. * testsuite/27_io/ios_base/cons/copy_neg.cc: Same. * testsuite/ext/profile/mutex_extensions_neg.cc: Same. * testsuite/ext/profile/profiler_algos.cc: Same. * testsuite/ext/type_traits/add_unsigned_floating_neg.cc: Same. * testsuite/ext/type_traits/add_unsigned_integer_neg.cc: Same. * testsuite/ext/type_traits/remove_unsigned_floating_neg.cc: Same. * testsuite/ext/type_traits/remove_unsigned_integer_neg.cc: Same. * testsuite/tr1/2_general_utilities/shared_ptr/cons/43820_neg.cc: Same. From-SVN: r169421
178 lines
4.9 KiB
C++
178 lines
4.9 KiB
C++
// Stream buffer classes -*- C++ -*-
|
|
|
|
// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
|
|
// 2006, 2009, 2010 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 3, or (at your option)
|
|
// any later version.
|
|
|
|
// This library is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
|
|
// 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.
|
|
|
|
// 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
|
|
// <http://www.gnu.org/licenses/>.
|
|
|
|
/** @file bits/streambuf.tcc
|
|
* This is an internal header file, included by other library headers.
|
|
* Do not attempt to use it directly. @headername{streambuf}
|
|
*/
|
|
|
|
//
|
|
// ISO C++ 14882: 27.5 Stream buffers
|
|
//
|
|
|
|
#ifndef _STREAMBUF_TCC
|
|
#define _STREAMBUF_TCC 1
|
|
|
|
#pragma GCC system_header
|
|
|
|
namespace std _GLIBCXX_VISIBILITY(default)
|
|
{
|
|
_GLIBCXX_BEGIN_NAMESPACE_VERSION
|
|
|
|
template<typename _CharT, typename _Traits>
|
|
streamsize
|
|
basic_streambuf<_CharT, _Traits>::
|
|
xsgetn(char_type* __s, streamsize __n)
|
|
{
|
|
streamsize __ret = 0;
|
|
while (__ret < __n)
|
|
{
|
|
const streamsize __buf_len = this->egptr() - this->gptr();
|
|
if (__buf_len)
|
|
{
|
|
const streamsize __remaining = __n - __ret;
|
|
const streamsize __len = std::min(__buf_len, __remaining);
|
|
traits_type::copy(__s, this->gptr(), __len);
|
|
__ret += __len;
|
|
__s += __len;
|
|
this->gbump(__len);
|
|
}
|
|
|
|
if (__ret < __n)
|
|
{
|
|
const int_type __c = this->uflow();
|
|
if (!traits_type::eq_int_type(__c, traits_type::eof()))
|
|
{
|
|
traits_type::assign(*__s++, traits_type::to_char_type(__c));
|
|
++__ret;
|
|
}
|
|
else
|
|
break;
|
|
}
|
|
}
|
|
return __ret;
|
|
}
|
|
|
|
template<typename _CharT, typename _Traits>
|
|
streamsize
|
|
basic_streambuf<_CharT, _Traits>::
|
|
xsputn(const char_type* __s, streamsize __n)
|
|
{
|
|
streamsize __ret = 0;
|
|
while (__ret < __n)
|
|
{
|
|
const streamsize __buf_len = this->epptr() - this->pptr();
|
|
if (__buf_len)
|
|
{
|
|
const streamsize __remaining = __n - __ret;
|
|
const streamsize __len = std::min(__buf_len, __remaining);
|
|
traits_type::copy(this->pptr(), __s, __len);
|
|
__ret += __len;
|
|
__s += __len;
|
|
this->pbump(__len);
|
|
}
|
|
|
|
if (__ret < __n)
|
|
{
|
|
int_type __c = this->overflow(traits_type::to_int_type(*__s));
|
|
if (!traits_type::eq_int_type(__c, traits_type::eof()))
|
|
{
|
|
++__ret;
|
|
++__s;
|
|
}
|
|
else
|
|
break;
|
|
}
|
|
}
|
|
return __ret;
|
|
}
|
|
|
|
// Conceivably, this could be used to implement buffer-to-buffer
|
|
// copies, if this was ever desired in an un-ambiguous way by the
|
|
// standard.
|
|
template<typename _CharT, typename _Traits>
|
|
streamsize
|
|
__copy_streambufs_eof(basic_streambuf<_CharT, _Traits>* __sbin,
|
|
basic_streambuf<_CharT, _Traits>* __sbout,
|
|
bool& __ineof)
|
|
{
|
|
streamsize __ret = 0;
|
|
__ineof = true;
|
|
typename _Traits::int_type __c = __sbin->sgetc();
|
|
while (!_Traits::eq_int_type(__c, _Traits::eof()))
|
|
{
|
|
__c = __sbout->sputc(_Traits::to_char_type(__c));
|
|
if (_Traits::eq_int_type(__c, _Traits::eof()))
|
|
{
|
|
__ineof = false;
|
|
break;
|
|
}
|
|
++__ret;
|
|
__c = __sbin->snextc();
|
|
}
|
|
return __ret;
|
|
}
|
|
|
|
template<typename _CharT, typename _Traits>
|
|
inline streamsize
|
|
__copy_streambufs(basic_streambuf<_CharT, _Traits>* __sbin,
|
|
basic_streambuf<_CharT, _Traits>* __sbout)
|
|
{
|
|
bool __ineof;
|
|
return __copy_streambufs_eof(__sbin, __sbout, __ineof);
|
|
}
|
|
|
|
// 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
|
|
streamsize
|
|
__copy_streambufs(basic_streambuf<char>*,
|
|
basic_streambuf<char>*);
|
|
extern template
|
|
streamsize
|
|
__copy_streambufs_eof(basic_streambuf<char>*,
|
|
basic_streambuf<char>*, bool&);
|
|
|
|
#ifdef _GLIBCXX_USE_WCHAR_T
|
|
extern template class basic_streambuf<wchar_t>;
|
|
extern template
|
|
streamsize
|
|
__copy_streambufs(basic_streambuf<wchar_t>*,
|
|
basic_streambuf<wchar_t>*);
|
|
extern template
|
|
streamsize
|
|
__copy_streambufs_eof(basic_streambuf<wchar_t>*,
|
|
basic_streambuf<wchar_t>*, bool&);
|
|
#endif
|
|
#endif
|
|
|
|
_GLIBCXX_END_NAMESPACE_VERSION
|
|
} // namespace
|
|
|
|
#endif
|