From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2140) id 6E74F3851C09; Tue, 19 May 2020 09:10:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6E74F3851C09 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1589879443; bh=MEnq8Tw0MZpcrAaTZNodGVtM+8+wE2nrzO3BBKLQgZE=; h=From:To:Subject:Date:From; b=Y++hoqJ3Akz7J4vzgEfbX1Kk/OnOg51peirS++2hip5+yKKe14eA2NwQXBi0zLEHK hMMnxa8uEHRRwRz/YUh8Dj23qvRApHeNvy3RI+gDy5SAmdZYQ6hzgvNr//bu99Vxb/ Kt5s4ExDm9GrUne9SJ0K/zfYNvtWO1/QwG8X9eiw= 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/testme)] Use const for template argument. X-Act-Checkin: gcc X-Git-Author: Martin Liska X-Git-Refname: refs/users/aoliva/heads/testme X-Git-Oldrev: 98f7381d17a1ad47773b70a5de7d94a164357916 X-Git-Newrev: 03f9754665b889e0988d0392db1eb35e91b97693 Message-Id: <20200519091043.6E74F3851C09@sourceware.org> Date: Tue, 19 May 2020 09:10:43 +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 09:10:43 -0000 https://gcc.gnu.org/g:03f9754665b889e0988d0392db1eb35e91b97693 commit 03f9754665b889e0988d0392db1eb35e91b97693 Author: Martin Liska Date: Tue Feb 4 14:55:25 2020 +0100 Use const for template argument. libstdc++-v3/ChangeLog: 2020-02-04 Martin Liska PR c/92472 * include/parallel/multiway_merge.h: Use const for _Compare template argument. Diff: --- libstdc++-v3/include/parallel/multiway_merge.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/include/parallel/multiway_merge.h b/libstdc++-v3/include/parallel/multiway_merge.h index 983c7b2bd9a..97a9ce0feb7 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, _Compare>& __bi2) + _GuardedIterator<_RAIter, const _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, _Compare>& __bi2) + _UnguardedIterator<_RAIter, const _Compare>& __bi2) { // Normal compare. return (__bi1.__comp)(*__bi1, *__bi2);