From 3e60f17145dc779ecdc835baed2ba558a80eb56f Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 27 Feb 2013 00:13:03 +0000 Subject: [PATCH] streambuf (basic_streambuf): Use injected class name instead of non-standard __streambuf_type typedef. * include/std/streambuf (basic_streambuf): Use injected class name instead of non-standard __streambuf_type typedef. Fix unclosed Doxygen group. From-SVN: r196297 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/include/std/streambuf | 17 ++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 91f540aa8a65..649f89b03e62 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2013-02-26 Jonathan Wakely + + * include/std/streambuf (basic_streambuf): Use injected class name + instead of non-standard __streambuf_type typedef. Fix unclosed Doxygen + group. + 2012-12-16 Jonathan Wakely * src/c++11/thread.cc (execute_native_thread_routine): Do not swallow diff --git a/libstdc++-v3/include/std/streambuf b/libstdc++-v3/include/std/streambuf index b46efec46010..383a99b5fb64 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, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +// 2006, 2007, 2008, 2009, 2010, 2011, 2013 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 @@ -171,20 +171,19 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION basic_string<_CharT2, _Traits2, _Alloc>&, _CharT2); protected: - //@{ - /** + /* * 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 */ - char_type* _M_in_beg; // Start of get area. - char_type* _M_in_cur; // Current read area. - char_type* _M_in_end; // End of get area. - char_type* _M_out_beg; // Start of put area. - char_type* _M_out_cur; // Current put area. - char_type* _M_out_end; // End of put area. + char_type* _M_in_beg; //< Start of get area. + char_type* _M_in_cur; //< Current read area. + char_type* _M_in_end; //< End of get area. + char_type* _M_out_beg; //< Start of put area. + char_type* _M_out_cur; //< Current put area. + char_type* _M_out_end; //< End of put area. /// Current locale setting. locale _M_buf_locale; -- 2.47.2