diff options
| author | Martin Liska <mliska@suse.cz> | 2020-05-06 12:07:12 +0200 |
|---|---|---|
| committer | Martin Liska <mliska@suse.cz> | 2020-05-06 12:09:05 +0200 |
| commit | 6208287fcaf01d3f300442c14a2c13815fbb3191 (patch) | |
| tree | 049a628a63e9b221856725fac765b0f082e25c61 /libstdc++-v3 | |
| parent | 308e2c1ccae3c60ac61ce0150bfd1889cbf24196 (diff) | |
Revert "Use const for template argument."
This reverts commit 03f9754665b889e0988d0392db1eb35e91b97693.
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 8 | ||||
| -rw-r--r-- | 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 <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 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); |