From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2140) id 05AFE3895459; Tue, 19 May 2020 08:44:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 05AFE3895459 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1589877882; bh=7aR2waALJfy81/wpAB01eSn7rYujJm/21KU5HIkO4hE=; h=From:To:Subject:Date:From; b=L8KXmJ5MkgRw6VWmpVpIacptMU3cn5TC5cCAgO81WUdOro2+DVm8tAEvLeseE+Qyl eOIQZq18pyQ+Bbv4HFEfg0JGy8FCbDhL/3XL1vMcYKLTlbfVmnrlWb6q3VDhYRtiUO hogqdMWa0E09wQEfaWf3OCvx7c69OX5xdu5oiBgo= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Alexandre Oliva To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc(refs/users/aoliva/heads/testbase)] Revert "Use const for template argument." X-Act-Checkin: gcc X-Git-Author: Martin Liska X-Git-Refname: refs/users/aoliva/heads/testbase X-Git-Oldrev: 308e2c1ccae3c60ac61ce0150bfd1889cbf24196 X-Git-Newrev: 6208287fcaf01d3f300442c14a2c13815fbb3191 Message-Id: <20200519084442.05AFE3895459@sourceware.org> Date: Tue, 19 May 2020 08:44:42 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 May 2020 08:44:42 -0000 https://gcc.gnu.org/g:6208287fcaf01d3f300442c14a2c13815fbb3191 commit 6208287fcaf01d3f300442c14a2c13815fbb3191 Author: Martin Liska Date: Wed May 6 12:07:12 2020 +0200 Revert "Use const for template argument." This reverts commit 03f9754665b889e0988d0392db1eb35e91b97693. Diff: --- libstdc++-v3/ChangeLog | 8 ++++++++ libstdc++-v3/include/parallel/multiway_merge.h | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 0e5af3d6dc4..25a8f08e089 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2020-05-06 Martin Liska + + Revert: + 2020-05-05 Martin Liska + PR c/92472 + * include/parallel/multiway_merge.h: + Use const for _Compare template argument. + 2020-05-06 Jonathan Wakely * doc/xml/manual/abi.xml (abi.versioning.history): Document library diff --git a/libstdc++-v3/include/parallel/multiway_merge.h b/libstdc++-v3/include/parallel/multiway_merge.h index 97a9ce0feb7..983c7b2bd9a 100644 --- a/libstdc++-v3/include/parallel/multiway_merge.h +++ b/libstdc++-v3/include/parallel/multiway_merge.h @@ -118,7 +118,7 @@ namespace __gnu_parallel * @return @c true if less. */ friend bool operator<(_GuardedIterator<_RAIter, _Compare>& __bi1, - _GuardedIterator<_RAIter, const _Compare>& __bi2) + _GuardedIterator<_RAIter, _Compare>& __bi2) { if (__bi1._M_current == __bi1._M_end) // __bi1 is sup return __bi2._M_current == __bi2._M_end; // __bi2 is not sup @@ -188,7 +188,7 @@ namespace __gnu_parallel * @return @c true if less. */ friend bool operator<(_UnguardedIterator<_RAIter, _Compare>& __bi1, - _UnguardedIterator<_RAIter, const _Compare>& __bi2) + _UnguardedIterator<_RAIter, _Compare>& __bi2) { // Normal compare. return (__bi1.__comp)(*__bi1, *__bi2);