From patchwork Wed Feb 20 22:45:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 222159 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id A23A82C007B for ; Thu, 21 Feb 2013 09:46:12 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1362005172; h=Comment: DomainKey-Signature:Received:Received:Received:Received: MIME-Version:Received:Date:Message-ID:Subject:From:To: Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:Sender:Delivered-To; bh=yNRy2SP nWWTTuR3CUFX4kDTn5dg=; b=SK3s78eDVvrSCxKJP+kvDwt5rkhU72p+IeqGExp TNSrXR7eXhVSYiCF1ci6elArf/itJYjpBVAQ4+d5/rPtSSRNeb+Rz75/BoXcRtrw QTr+hO1pW05qtCpG/Uf4wZFUHddfJYzp4EfLtuiwdQaNXdta6fD7pFQ8LgMETq70 jGGM= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:MIME-Version:X-Received:Received:Date:Message-ID:Subject:From:To:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=u2l5HrdNTPmVovfritHologsSJtk7YhycZGJuRDkd2wPTSGlXgOkT1F06KpSR8 pNU1ppoe3xjb5Ec+dcgncEh95XmfZ0pl46vPbPcvNoT31oUV1/ZIwj+DnhnzF4cR n190TEabq5YEQPOII+l24kDkhMvTI4hKKMfZSDLDrGbhc=; Received: (qmail 30329 invoked by alias); 20 Feb 2013 22:46:07 -0000 Received: (qmail 30317 invoked by uid 22791); 20 Feb 2013 22:46:06 -0000 X-SWARE-Spam-Status: No, hits=-4.5 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, KHOP_RCVD_TRUST, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE X-Spam-Check-By: sourceware.org Received: from mail-ie0-f176.google.com (HELO mail-ie0-f176.google.com) (209.85.223.176) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 20 Feb 2013 22:45:58 +0000 Received: by mail-ie0-f176.google.com with SMTP id k13so10557719iea.21 for ; Wed, 20 Feb 2013 14:45:58 -0800 (PST) MIME-Version: 1.0 X-Received: by 10.50.168.41 with SMTP id zt9mr11360686igb.42.1361400357973; Wed, 20 Feb 2013 14:45:57 -0800 (PST) Received: by 10.64.15.10 with HTTP; Wed, 20 Feb 2013 14:45:57 -0800 (PST) Date: Wed, 20 Feb 2013 22:45:57 +0000 Message-ID: Subject: [patch] Fix libstdc++ doxygen page for basic_streambuf From: Jonathan Wakely To: "libstdc++" , gcc-patches Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org This removes an unclosed @{ group marker so that Doxygen doesn't put half the members of basic_streambuf in the "Friends" section (see http://stackoverflow.com/q/14988997/981959) I also changed uses of __streambuf_type to basic_streambuf, which makes the Doxygen page look better because it doesn't use the non-standard name. * include/std/streambuf (basic_streambuf): Use injected class name instead of non-standard __streambuf_type typedef. Fix unclosed Doxygen group. Tested x86_64-linux, committed to trunk. I'll also make a smaller change to 4.6 and 4.7 to just fix the doxygen group markup. commit 8180df2e135e7a8957069bc50cf240900c9eb1c9 Author: Jonathan Wakely Date: Wed Feb 20 22:13:32 2013 +0000 * include/std/streambuf (basic_streambuf): Use injected class name instead of non-standard __streambuf_type typedef. Fix unclosed Doxygen group. diff --git a/libstdc++-v3/include/std/streambuf b/libstdc++-v3/include/std/streambuf index 00b3dd1..26a3871 100644 --- a/libstdc++-v3/include/std/streambuf +++ b/libstdc++-v3/include/std/streambuf @@ -145,7 +145,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION friend class ostreambuf_iterator; friend streamsize - __copy_streambufs_eof<>(__streambuf_type*, __streambuf_type*, bool&); + __copy_streambufs_eof<>(basic_streambuf*, basic_streambuf*, bool&); template friend typename __gnu_cxx::__enable_if<__is_char<_CharT2>::__value, @@ -174,20 +174,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; @@ -236,7 +235,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * derived @c foo member functions, passing the arguments (if any) * and returning the result unchanged. */ - __streambuf_type* + basic_streambuf* pubsetbuf(char_type* __s, streamsize __n) { return this->setbuf(__s, __n); } @@ -800,15 +799,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION private: // _GLIBCXX_RESOLVE_LIB_DEFECTS // Side effect of DR 50. - basic_streambuf(const __streambuf_type& __sb) + basic_streambuf(const basic_streambuf& __sb) : _M_in_beg(__sb._M_in_beg), _M_in_cur(__sb._M_in_cur), _M_in_end(__sb._M_in_end), _M_out_beg(__sb._M_out_beg), _M_out_cur(__sb._M_out_cur), _M_out_end(__sb._M_out_cur), _M_buf_locale(__sb._M_buf_locale) { } - __streambuf_type& - operator=(const __streambuf_type&) { return *this; }; + basic_streambuf& + operator=(const basic_streambuf&) { return *this; }; }; // Explicit specialization declarations, defined in src/streambuf.cc.