From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by sourceware.org (Postfix) with ESMTP id 6D96C395BC53 for ; Thu, 8 Apr 2021 23:17:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 6D96C395BC53 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-580-krBkbLAoOK-Lx2c7a1blXA-1; Thu, 08 Apr 2021 19:17:52 -0400 X-MC-Unique: krBkbLAoOK-Lx2c7a1blXA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 35951593B1; Thu, 8 Apr 2021 23:17:51 +0000 (UTC) Received: from localhost (unknown [10.33.36.164]) by smtp.corp.redhat.com (Postfix) with ESMTP id D833A196E3; Thu, 8 Apr 2021 23:17:50 +0000 (UTC) Date: Fri, 9 Apr 2021 00:17:50 +0100 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Remove spurious line break in doxygen comment Message-ID: MIME-Version: 1.0 X-Clacks-Overhead: GNU Terry Pratchett X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="y0RQCR/+u6394RAO" Content-Disposition: inline X-Spam-Status: No, score=-14.0 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libstdc++@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++ mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Apr 2021 23:17:56 -0000 --y0RQCR/+u6394RAO Content-Type: text/plain; charset=us-ascii Content-Disposition: inline libstdc++-v3/ChangeLog: * include/bits/basic_string.h: Tweak doxygen comment. Tested powerpc64le-linux. Committed to trunk. --y0RQCR/+u6394RAO Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch.txt" commit 96292c3e3439aa167ed7ae595f89b8776e705897 Author: Jonathan Wakely Date: Thu Apr 8 23:39:29 2021 libstdc++: Remove spurious line break in doxygen comment libstdc++-v3/ChangeLog: * include/bits/basic_string.h: Tweak doxygen comment. diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h index 7d819bb1bb7..3c5309d16e6 100644 --- a/libstdc++-v3/include/bits/basic_string.h +++ b/libstdc++-v3/include/bits/basic_string.h @@ -4709,8 +4709,7 @@ _GLIBCXX_END_NAMESPACE_CXX11 * @brief Insert a string_view. * @param __pos1 Position in string to insert at. * @param __svt The object convertible to string_view to insert from. - * @param __pos2 Position in string_view to insert - * from. + * @param __pos2 Position in string_view to insert from. * @param __n The number of characters to insert. * @return Reference to this string. */ --y0RQCR/+u6394RAO--