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 [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id A23EB395BC53 for ; Wed, 2 Dec 2020 12:28:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org A23EB395BC53 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-247--gTpmd1dOqS5Ikyr9Quslg-1; Wed, 02 Dec 2020 07:28:54 -0500 X-MC-Unique: -gTpmd1dOqS5Ikyr9Quslg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 54DDF612A2; Wed, 2 Dec 2020 12:28:53 +0000 (UTC) Received: from localhost (unknown [10.33.37.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id E5C0C60BFA; Wed, 2 Dec 2020 12:28:52 +0000 (UTC) Date: Wed, 2 Dec 2020 12:28:52 +0000 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Fix indentation in rope Message-ID: <20201202122852.GA3572009@redhat.com> MIME-Version: 1.0 X-Clacks-Overhead: GNU Terry Pratchett X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="uAKRQypu60I7Lcqm" Content-Disposition: inline X-Spam-Status: No, score=-14.7 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_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=unavailable 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: Wed, 02 Dec 2020 12:29:00 -0000 --uAKRQypu60I7Lcqm Content-Type: text/plain; charset=us-ascii Content-Disposition: inline libstdc++-v3/ChangeLog: * include/ext/rope: Fix indentation of access specifiers. Tested powerpc64le-linux. Committed to trunk. --uAKRQypu60I7Lcqm Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch.txt" commit d38fbb5a863dfc00631c74a525a908cef620e149 Author: Jonathan Wakely Date: Wed Dec 2 11:25:42 2020 libstdc++: Fix indentation in rope libstdc++-v3/ChangeLog: * include/ext/rope: Fix indentation of access specifiers. diff --git a/libstdc++-v3/include/ext/rope b/libstdc++-v3/include/ext/rope index 08e510bb0dc..8479acd8f74 100644 --- a/libstdc++-v3/include/ext/rope +++ b/libstdc++-v3/include/ext/rope @@ -675,7 +675,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION static void _S_ref(_Rope_RopeRep*) { } static void _S_free_if_unref(_Rope_RopeRep*) { } # endif -protected: + protected: _Rope_RopeRep& operator=(const _Rope_RopeRep&); @@ -742,7 +742,7 @@ protected: this->__STL_FREE_STRING(_M_data, this->_M_size, this->_M_get_allocator()); } #endif -protected: + protected: _Rope_RopeLeaf& operator=(const _Rope_RopeLeaf&); @@ -778,7 +778,7 @@ protected: _M_right->_M_unref_nonnil(); } #endif -protected: + protected: _Rope_RopeConcatenation& operator=(const _Rope_RopeConcatenation&); @@ -1508,7 +1508,7 @@ protected: __ROPE_DEFINE_ALLOCS(_Alloc) #undef __ROPE_DEFINE_ALLOC - protected: + protected: _Rope_base& operator=(const _Rope_base&); --uAKRQypu60I7Lcqm--