diff options
Diffstat (limited to 'libstdc++-v3/include/std/streambuf')
| -rw-r--r-- | libstdc++-v3/include/std/streambuf | 43 |
1 files changed, 12 insertions, 31 deletions
diff --git a/libstdc++-v3/include/std/streambuf b/libstdc++-v3/include/std/streambuf index 5e710377ab4..a2e47505c6f 100644 --- a/libstdc++-v3/include/std/streambuf +++ b/libstdc++-v3/include/std/streambuf @@ -1,7 +1,7 @@ // Stream buffer classes -*- C++ -*- -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 -// Free Software Foundation, Inc. +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, +// 2006, 2007, 2008 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 @@ -50,11 +50,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std) - /** - * @if maint - * Does stuff. - * @endif - */ template<typename _CharT, typename _Traits> streamsize __copy_streambufs_eof(basic_streambuf<_CharT, _Traits>*, @@ -138,11 +133,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) //@} //@{ - /** - * @if maint - * This is a non-standard type. - * @endif - */ + /// This is a non-standard type. typedef basic_streambuf<char_type, traits_type> __streambuf_type; //@} @@ -155,11 +146,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std) friend streamsize __copy_streambufs_eof<>(__streambuf_type*, __streambuf_type*, bool&); - template<typename _CharT2> + template<bool _IsMove, typename _CharT2> friend typename __gnu_cxx::__enable_if<__is_char<_CharT2>::__value, _CharT2*>::__type - __copy_aux(istreambuf_iterator<_CharT2>, - istreambuf_iterator<_CharT2>, _CharT2*); + __copy_move_a2(istreambuf_iterator<_CharT2>, + istreambuf_iterator<_CharT2>, _CharT2*); template<typename _CharT2> friend typename __gnu_cxx::__enable_if<__is_char<_CharT2>::__value, @@ -184,13 +175,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std) protected: //@{ /** - * @if maint * This is based on _IO_FILE, just reordered to be more consistent, * and is intended to be the most minimal abstraction for an * internal buffer. * - get == input == read * - put == output == write - * @endif */ char_type* _M_in_beg; // Start of get area. char_type* _M_in_cur; // Current read area. @@ -199,11 +188,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) char_type* _M_out_cur; // Current put area. char_type* _M_out_end; // End of put area. - /** - * @if maint - * Current locale setting. - * @endif - */ + /// Current locale setting. locale _M_buf_locale; public: @@ -574,7 +559,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // [27.5.2.4.2] buffer management and positioning /** - * @brief Maniuplates the buffer. + * @brief Manipulates the buffer. * * Each derived class provides its own appropriate behavior. See * the next-to-last paragraph of @@ -670,7 +655,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) * next available character is returned, or @c traits::eof() to * indicate a null pending sequence. * - * For a formal definiton of the pending sequence, see a good text + * For a formal definition of the pending sequence, see a good text * such as Langer & Kreft, or [27.5.2.4.3]/7-14. * * A functioning input streambuf can be created by overriding only @@ -751,7 +736,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) * sequence verbatim.) In either case, the character @a c is also * written out, if @a c is not @c eof(). * - * For a formal definiton of this function, see a good text + * For a formal definition of this function, see a good text * such as Langer & Kreft, or [27.5.2.4.5]/3-7. * * A functioning output streambuf can be created by overriding only @@ -763,7 +748,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) overflow(int_type /* __c */ = traits_type::eof()) { return traits_type::eof(); } -#ifdef _GLIBCXX_DEPRECATED +#if _GLIBCXX_DEPRECATED // Annex D.6 public: /** @@ -773,11 +758,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) * been read. * * See http://gcc.gnu.org/ml/libstdc++/2002-05/msg00168.html - * - * @note This function has been deprecated by the standard. You - * must define @c _GLIBCXX_DEPRECATED to make this visible; see - * c++config.h. - */ + */ void stossc() { |