Revert "Use const for template argument."

This reverts commit 03f9754665b889e0988d0392db1eb35e91b97693.

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 0e5af3d6dc42f0f2c5dbaab2f333ac7408f6cba4..25a8f08e0899f24b0915fa6dfe3fb33a16aeb78d 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2020-05-06  Martin Liska  <mliska@suse.cz>
+
+       Revert:
+       2020-05-05  Martin Liska  <mliska@suse.cz>
+       PR c/92472
+       * include/parallel/multiway_merge.h:
+       Use const for _Compare template argument.
+
 2020-05-06  Jonathan Wakely  <jwakely@redhat.com>
 
        * 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 97a9ce0feb79f1d923b05116fa10dca604f86ade..983c7b2bd9a6d12c06abba9921a1087221cc9e34 100644 (file)
--- 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);