Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2226754/?format=api
{ "id": 2226754, "url": "http://patchwork.ozlabs.org/api/patches/2226754/?format=api", "web_url": "http://patchwork.ozlabs.org/project/gcc/patch/bmm.hhuozlstss.gcc.gcc-TEST.tkaminsk.78.1.8@forge-stage.sourceware.org/", "project": { "id": 17, "url": "http://patchwork.ozlabs.org/api/projects/17/?format=api", "name": "GNU Compiler Collection", "link_name": "gcc", "list_id": "gcc-patches.gcc.gnu.org", "list_email": "gcc-patches@gcc.gnu.org", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<bmm.hhuozlstss.gcc.gcc-TEST.tkaminsk.78.1.8@forge-stage.sourceware.org>", "list_archive_url": null, "date": "2026-04-22T18:44:06", "name": "[v1,08/12] libstdc++: Eliminate __gnu_cxx::__ops function objects (VIII)", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "697bc05e6064522a1f3ae4f8da7f961d3193a088", "submitter": { "id": 93223, "url": "http://patchwork.ozlabs.org/api/people/93223/?format=api", "name": "tkaminsk via Sourceware Forge", "email": "forge-bot+tkaminsk@forge-stage.sourceware.org" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/gcc/patch/bmm.hhuozlstss.gcc.gcc-TEST.tkaminsk.78.1.8@forge-stage.sourceware.org/mbox/", "series": [ { "id": 501087, "url": "http://patchwork.ozlabs.org/api/series/501087/?format=api", "web_url": "http://patchwork.ozlabs.org/project/gcc/list/?series=501087", "date": "2026-04-22T18:44:01", "name": "remove-predefined-ops", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/501087/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2226754/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2226754/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "gcc-patches@gcc.gnu.org" ], "Delivered-To": [ "patchwork-incoming@legolas.ozlabs.org", "gcc-patches@gcc.gnu.org" ], "Authentication-Results": [ "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org\n (client-ip=2620:52:6:3111::32; helo=vm01.sourceware.org;\n envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org;\n receiver=patchwork.ozlabs.org)", "sourceware.org; dmarc=none (p=none dis=none)\n header.from=forge-stage.sourceware.org", "sourceware.org;\n spf=pass smtp.mailfrom=forge-stage.sourceware.org", "server2.sourceware.org;\n arc=none smtp.remote-ip=38.145.34.39" ], "Received": [ "from vm01.sourceware.org (vm01.sourceware.org\n [IPv6:2620:52:6:3111::32])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g18G953Xtz1yGs\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 23 Apr 2026 05:21:05 +1000 (AEST)", "from vm01.sourceware.org (localhost [127.0.0.1])\n\tby sourceware.org (Postfix) with ESMTP id B1E5A4319177\n\tfor <incoming@patchwork.ozlabs.org>; Wed, 22 Apr 2026 19:21:03 +0000 (GMT)", "from forge-stage.sourceware.org (vm08.sourceware.org [38.145.34.39])\n by sourceware.org (Postfix) with ESMTPS id 607F140A0879\n for <gcc-patches@gcc.gnu.org>; Wed, 22 Apr 2026 18:45:35 +0000 (GMT)", "from forge-stage.sourceware.org (localhost [IPv6:::1])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256)\n (No client certificate requested)\n by forge-stage.sourceware.org (Postfix) with ESMTPS id 9332143528\n for <gcc-patches@gcc.gnu.org>; Wed, 22 Apr 2026 18:45:33 +0000 (UTC)" ], "DKIM-Filter": [ "OpenDKIM Filter v2.11.0 sourceware.org B1E5A4319177", "OpenDKIM Filter v2.11.0 sourceware.org 607F140A0879" ], "DMARC-Filter": "OpenDMARC Filter v1.4.2 sourceware.org 607F140A0879", "ARC-Filter": "OpenARC Filter v1.0.0 sourceware.org 607F140A0879", "ARC-Seal": "i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1776883535; cv=none;\n b=hNqPAfZBKeuYxbwDIpIJ/s6b8BjVVyT71+388luCoumdNajIohQpfE017cR8tv7KD7H+3+h16F7TDSgBYU8P87LI3ljrjBmBVtah3QdKWv8ZZq9heZ+hh7vWErhhIypSc43vl2TWpx2spQh0KAdPrCdTWtcVaYBDoQ4jRSPjyRg=", "ARC-Message-Signature": "i=1; a=rsa-sha256; d=sourceware.org; s=key;\n t=1776883535; c=relaxed/simple;\n bh=Z4d6Qf3z7ObV2w20iLaZHjrI9/ATNAlPHhp+SRw6rr8=;\n h=From:Date:Subject:To:Message-ID;\n b=hxm8sd1nK/W68XC+SlyJAa2q5J+Wfp2mQpHLQmUlQZnOp3O1k4aegrrOVE7BNIhAX+DP0yEY7FZG6Q6/0PAdjyS0WhgzyOdsMWn+MkDErxrPGT+lS0lBGRHdyLZKOakmJShkh8u/Q0te9Uc1IaFqqw7pp4pyRBPQT/w31OKWew4=", "ARC-Authentication-Results": "i=1; server2.sourceware.org", "From": "tkaminsk via Sourceware Forge\n <forge-bot+tkaminsk@forge-stage.sourceware.org>", "Date": "Wed, 22 Apr 2026 18:44:06 +0000", "Subject": "[PATCH v1 08/12] libstdc++: Eliminate __gnu_cxx::__ops function\n objects (VIII)", "To": "gcc-patches mailing list <gcc-patches@gcc.gnu.org>", "Message-ID": "\n <bmm.hhuozlstss.gcc.gcc-TEST.tkaminsk.78.1.8@forge-stage.sourceware.org>", "X-Mailer": "batrachomyomachia", "X-Requested-Reviewer": "fdumont", "X-Pull-Request-Organization": "gcc", "X-Pull-Request-Repository": "gcc-TEST", "X-Pull-Request": "https://forge.sourceware.org/gcc/gcc-TEST/pulls/78", "References": "\n <bmm.hhuozlstss.gcc.gcc-TEST.tkaminsk.78.1.0@forge-stage.sourceware.org>", "In-Reply-To": "\n <bmm.hhuozlstss.gcc.gcc-TEST.tkaminsk.78.1.0@forge-stage.sourceware.org>", "X-Patch-URL": "\n https://forge.sourceware.org/redi/gcc/commit/bf5bf9f3073699e47405dde7704f1e02fa88407a", "X-BeenThere": "gcc-patches@gcc.gnu.org", "X-Mailman-Version": "2.1.30", "Precedence": "list", "List-Id": "Gcc-patches mailing list <gcc-patches.gcc.gnu.org>", "List-Unsubscribe": "<https://gcc.gnu.org/mailman/options/gcc-patches>,\n <mailto:gcc-patches-request@gcc.gnu.org?subject=unsubscribe>", "List-Archive": "<https://gcc.gnu.org/pipermail/gcc-patches/>", "List-Post": "<mailto:gcc-patches@gcc.gnu.org>", "List-Help": "<mailto:gcc-patches-request@gcc.gnu.org?subject=help>", "List-Subscribe": "<https://gcc.gnu.org/mailman/listinfo/gcc-patches>,\n <mailto:gcc-patches-request@gcc.gnu.org?subject=subscribe>", "Reply-To": "gcc-patches mailing list <gcc-patches@gcc.gnu.org>,\n tkaminsk@gcc.gnu.org", "Errors-To": "gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org" }, "content": "From: Jonathan Wakely <jwakely@redhat.com>\n\nHeap algos and sorting algos.\n\nlibstdc++-v3/ChangeLog:\n\n\t* include/bits/stl_algo.h:\n\t* include/bits/stl_heap.h:\n---\n libstdc++-v3/include/bits/stl_algo.h | 106 ++++++++++++---------------\n libstdc++-v3/include/bits/stl_heap.h | 53 +++++---------\n 2 files changed, 66 insertions(+), 93 deletions(-)", "diff": "diff --git a/libstdc++-v3/include/bits/stl_algo.h b/libstdc++-v3/include/bits/stl_algo.h\nindex 9664b2345963..10f1e1550c4f 100644\n--- a/libstdc++-v3/include/bits/stl_algo.h\n+++ b/libstdc++-v3/include/bits/stl_algo.h\n@@ -85,21 +85,21 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION\n template<typename _Iterator, typename _Compare>\n _GLIBCXX20_CONSTEXPR\n void\n- __move_median_to_first(_Iterator __result,_Iterator __a, _Iterator __b,\n+ __move_median_to_first(_Iterator __result, _Iterator __a, _Iterator __b,\n \t\t\t _Iterator __c, _Compare __comp)\n {\n- if (__comp(__a, __b))\n+ if (__comp(*__a, *__b))\n \t{\n-\t if (__comp(__b, __c))\n+\t if (__comp(*__b, *__c))\n \t std::iter_swap(__result, __b);\n-\t else if (__comp(__a, __c))\n+\t else if (__comp(*__a, *__c))\n \t std::iter_swap(__result, __c);\n \t else\n \t std::iter_swap(__result, __a);\n \t}\n- else if (__comp(__a, __c))\n+ else if (__comp(*__a, *__c))\n \tstd::iter_swap(__result, __a);\n- else if (__comp(__b, __c))\n+ else if (__comp(*__b, *__c))\n \tstd::iter_swap(__result, __c);\n else\n \tstd::iter_swap(__result, __b);\n@@ -125,7 +125,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION\n __find_if_not_n(_InputIterator __first, _Distance& __len, _Predicate __pred)\n {\n for (; __len; --__len, (void) ++__first)\n-\tif (!__pred(__first))\n+\tif (!__pred(*__first))\n \t break;\n return __first;\n }\n@@ -1440,10 +1440,10 @@ _GLIBCXX_END_INLINE_ABI_NAMESPACE(_V2)\n // partition\n \n /// This is a helper function...\n- /// Requires __first != __last and !__pred(__first)\n+ /// Requires __first != __last and !__pred(*__first)\n /// and __len == distance(__first, __last).\n ///\n- /// !__pred(__first) allows us to guarantee that we don't\n+ /// !__pred(*__first) allows us to guarantee that we don't\n /// move-assign an element onto itself.\n template<typename _ForwardIterator, typename _Pointer, typename _Predicate,\n \t typename _Distance>\n@@ -1463,14 +1463,14 @@ _GLIBCXX_END_INLINE_ABI_NAMESPACE(_V2)\n \t _ForwardIterator __result1 = __first;\n \t _Pointer __result2 = __buffer;\n \n-\t // The precondition guarantees that !__pred(__first), so\n+\t // The precondition guarantees that !__pred(*__first), so\n \t // move that element to the buffer before starting the loop.\n \t // This ensures that we only call __pred once per element.\n \t *__result2 = _GLIBCXX_MOVE(*__first);\n \t ++__result2;\n \t ++__first;\n \t for (; __first != __last; ++__first)\n-\t if (__pred(__first))\n+\t if (__pred(*__first))\n \t {\n \t\t*__result1 = _GLIBCXX_MOVE(*__first);\n \t\t++__result1;\n@@ -1576,8 +1576,7 @@ _GLIBCXX_END_INLINE_ABI_NAMESPACE(_V2)\n \t typename iterator_traits<_ForwardIterator>::value_type>)\n __glibcxx_requires_valid_range(__first, __last);\n \n- return std::__stable_partition(__first, __last,\n-\t\t\t\t __gnu_cxx::__ops::__pred_iter(__pred));\n+ return std::__stable_partition(__first, __last, __pred);\n }\n #endif // HOSTED\n \n@@ -1593,7 +1592,7 @@ _GLIBCXX_END_INLINE_ABI_NAMESPACE(_V2)\n {\n std::__make_heap(__first, __middle, __comp);\n for (_RandomAccessIterator __i = __middle; __i < __last; ++__i)\n-\tif (__comp(__i, __first))\n+\tif (__comp(*__i, *__first))\n \t std::__pop_heap(__first, __middle, __i, __comp);\n }\n \n@@ -1626,7 +1625,7 @@ _GLIBCXX_END_INLINE_ABI_NAMESPACE(_V2)\n std::__make_heap(__result_first, __result_real_last, __comp);\n while (__first != __last)\n \t{\n-\t if (__comp(__first, __result_first))\n+\t if (__comp(*__first, *__result_first))\n \t std::__adjust_heap(__result_first, _DistanceType(0),\n \t\t\t _DistanceType(__result_real_last\n \t\t\t\t\t - __result_first),\n@@ -1684,7 +1683,7 @@ _GLIBCXX_END_INLINE_ABI_NAMESPACE(_V2)\n \n return std::__partial_sort_copy(__first, __last,\n \t\t\t\t __result_first, __result_last,\n-\t\t\t\t __gnu_cxx::__ops::__iter_less_iter());\n+\t\t\t\t __gnu_cxx::__ops::less());\n }\n \n /**\n@@ -1739,7 +1738,7 @@ _GLIBCXX_END_INLINE_ABI_NAMESPACE(_V2)\n \n return std::__partial_sort_copy(__first, __last,\n \t\t\t\t __result_first, __result_last,\n-\t\t\t\t__gnu_cxx::__ops::__iter_comp_iter(__comp));\n+\t\t\t\t __comp);\n }\n \n /// @cond undocumented\n@@ -1755,7 +1754,7 @@ _GLIBCXX_END_INLINE_ABI_NAMESPACE(_V2)\n \t__val = _GLIBCXX_MOVE(*__last);\n _RandomAccessIterator __next = __last;\n --__next;\n- while (__comp(__val, __next))\n+ while (__comp(__val, *__next))\n \t{\n \t *__last = _GLIBCXX_MOVE(*__next);\n \t __last = __next;\n@@ -1779,15 +1778,14 @@ _GLIBCXX_END_INLINE_ABI_NAMESPACE(_V2)\n \n for (_RandomAccessIterator __i = __first + _Dist(1); __i != __last; ++__i)\n \t{\n-\t if (__comp(__i, __first))\n+\t if (__comp(*__i, *__first))\n \t {\n \t typename _IterTraits::value_type __val = _GLIBCXX_MOVE(*__i);\n \t _GLIBCXX_MOVE_BACKWARD3(__first, __i, __i + _Dist(1));\n \t *__first = _GLIBCXX_MOVE(__val);\n \t }\n \t else\n-\t std::__unguarded_linear_insert(__i,\n-\t\t\t\t__gnu_cxx::__ops::__val_comp_iter(__comp));\n+\t std::__unguarded_linear_insert(__i, __comp);\n \t}\n }\n \n@@ -1799,8 +1797,7 @@ _GLIBCXX_END_INLINE_ABI_NAMESPACE(_V2)\n \t\t\t _RandomAccessIterator __last, _Compare __comp)\n {\n for (_RandomAccessIterator __i = __first; __i != __last; ++__i)\n-\tstd::__unguarded_linear_insert(__i,\n-\t\t\t\t__gnu_cxx::__ops::__val_comp_iter(__comp));\n+\tstd::__unguarded_linear_insert(__i, __comp);\n }\n \n /**\n@@ -1839,10 +1836,10 @@ _GLIBCXX_END_INLINE_ABI_NAMESPACE(_V2)\n {\n while (true)\n \t{\n-\t while (__comp(__first, __pivot))\n+\t while (__comp(*__first, *__pivot))\n \t ++__first;\n \t --__last;\n-\t while (__comp(__pivot, __last))\n+\t while (__comp(*__pivot, *__last))\n \t --__last;\n \t if (!(__first < __last))\n \t return __first;\n@@ -2260,7 +2257,7 @@ _GLIBCXX_END_INLINE_ABI_NAMESPACE(_V2)\n {\n while (__first1 != __last1 && __first2 != __last2)\n \t{\n-\t if (__comp(__first2, __first1))\n+\t if (__comp(*__first2, *__first1))\n \t {\n \t *__result = _GLIBCXX_MOVE(*__first2);\n \t ++__first2;\n@@ -2299,7 +2296,7 @@ _GLIBCXX_END_INLINE_ABI_NAMESPACE(_V2)\n --__last2;\n while (true)\n \t{\n-\t if (__comp(__last2, __last1))\n+\t if (__comp(*__last2, *__last1))\n \t {\n \t *--__result = _GLIBCXX_MOVE(*__last1);\n \t if (__first1 == __last1)\n@@ -2405,8 +2402,7 @@ _GLIBCXX_END_INLINE_ABI_NAMESPACE(_V2)\n \t __len11 = __len1 / 2;\n \t std::advance(__first_cut, __len11);\n \t __second_cut\n-\t\t= std::__lower_bound(__middle, __last, *__first_cut,\n-\t\t\t\t __gnu_cxx::__ops::__iter_comp_val(__comp));\n+\t\t= std::__lower_bound(__middle, __last, *__first_cut, __comp);\n \t __len22 = std::distance(__middle, __second_cut);\n \t }\n \t else\n@@ -2414,8 +2410,7 @@ _GLIBCXX_END_INLINE_ABI_NAMESPACE(_V2)\n \t __len22 = __len2 / 2;\n \t std::advance(__second_cut, __len22);\n \t __first_cut\n-\t\t= std::__upper_bound(__first, __middle, *__second_cut,\n-\t\t\t\t __gnu_cxx::__ops::__val_comp_iter(__comp));\n+\t\t= std::__upper_bound(__first, __middle, *__second_cut, __comp);\n \t __len11 = std::distance(__first, __first_cut);\n \t }\n \n@@ -2449,7 +2444,7 @@ _GLIBCXX_END_INLINE_ABI_NAMESPACE(_V2)\n \n if (__len1 + __len2 == 2)\n \t{\n-\t if (__comp(__middle, __first))\n+\t if (__comp(*__middle, *__first))\n \t std::iter_swap(__first, __middle);\n \t return;\n \t}\n@@ -2463,8 +2458,7 @@ _GLIBCXX_END_INLINE_ABI_NAMESPACE(_V2)\n \t __len11 = __len1 / 2;\n \t std::advance(__first_cut, __len11);\n \t __second_cut\n-\t = std::__lower_bound(__middle, __last, *__first_cut,\n-\t\t\t\t __gnu_cxx::__ops::__iter_comp_val(__comp));\n+\t = std::__lower_bound(__middle, __last, *__first_cut, __comp);\n \t __len22 = std::distance(__middle, __second_cut);\n \t}\n else\n@@ -2472,8 +2466,7 @@ _GLIBCXX_END_INLINE_ABI_NAMESPACE(_V2)\n \t __len22 = __len2 / 2;\n \t std::advance(__second_cut, __len22);\n \t __first_cut\n-\t = std::__upper_bound(__first, __middle, *__second_cut,\n-\t\t\t\t __gnu_cxx::__ops::__val_comp_iter(__comp));\n+\t = std::__upper_bound(__first, __middle, *__second_cut, __comp);\n \t __len11 = std::distance(__first, __first_cut);\n \t}\n \n@@ -2567,7 +2560,7 @@ _GLIBCXX_END_INLINE_ABI_NAMESPACE(_V2)\n __glibcxx_requires_irreflexive(__first, __last);\n \n std::__inplace_merge(__first, __middle, __last,\n-\t\t\t __gnu_cxx::__ops::__iter_less_iter());\n+\t\t\t __gnu_cxx::__ops::less());\n }\n \n /**\n@@ -2610,8 +2603,7 @@ _GLIBCXX_END_INLINE_ABI_NAMESPACE(_V2)\n __glibcxx_requires_sorted_pred(__middle, __last, __comp);\n __glibcxx_requires_irreflexive_pred(__first, __last, __comp);\n \n- std::__inplace_merge(__first, __middle, __last,\n-\t\t\t __gnu_cxx::__ops::__iter_comp_iter(__comp));\n+ std::__inplace_merge(__first, __middle, __last, __comp);\n }\n \n \n@@ -2625,7 +2617,7 @@ _GLIBCXX_END_INLINE_ABI_NAMESPACE(_V2)\n {\n while (__first1 != __last1 && __first2 != __last2)\n \t{\n-\t if (__comp(__first2, __first1))\n+\t if (__comp(*__first2, *__first1))\n \t {\n \t *__result = _GLIBCXX_MOVE(*__first2);\n \t ++__first2;\n@@ -2790,9 +2782,9 @@ _GLIBCXX_END_INLINE_ABI_NAMESPACE(_V2)\n {\n while (__first1 != __last1 && __first2 != __last2)\n \t{\n-\t if (__comp(__first2, __first1))\n+\t if (__comp(*__first2, *__first1))\n \t return false;\n-\t if (!__comp(__first1, __first2))\n+\t if (!__comp(*__first1, *__first2))\n \t ++__first2;\n \t ++__first1;\n \t}\n@@ -2839,7 +2831,7 @@ _GLIBCXX_END_INLINE_ABI_NAMESPACE(_V2)\n __glibcxx_requires_irreflexive2(__first2, __last2);\n \n return std::__includes(__first1, __last1, __first2, __last2,\n-\t\t\t __gnu_cxx::__ops::__iter_less_iter());\n+\t\t\t __gnu_cxx::__ops::less());\n }\n \n /**\n@@ -2885,8 +2877,7 @@ _GLIBCXX_END_INLINE_ABI_NAMESPACE(_V2)\n __glibcxx_requires_irreflexive_pred2(__first1, __last1, __comp);\n __glibcxx_requires_irreflexive_pred2(__first2, __last2, __comp);\n \n- return std::__includes(__first1, __last1, __first2, __last2,\n-\t\t\t __gnu_cxx::__ops::__iter_comp_iter(__comp));\n+ return std::__includes(__first1, __last1, __first2, __last2, __comp);\n }\n \n // nth_element\n@@ -3229,7 +3220,7 @@ _GLIBCXX_END_INLINE_ABI_NAMESPACE(_V2)\n \n _ForwardIterator __next = __first;\n for (++__next; __next != __last; __first = __next, (void)++__next)\n-\tif (__comp(__next, __first))\n+\tif (__comp(*__next, *__first))\n \t return __next;\n return __next;\n }\n@@ -3255,7 +3246,7 @@ _GLIBCXX_END_INLINE_ABI_NAMESPACE(_V2)\n __glibcxx_requires_irreflexive(__first, __last);\n \n return std::__is_sorted_until(__first, __last,\n-\t\t\t\t __gnu_cxx::__ops::__iter_less_iter());\n+\t\t\t\t __gnu_cxx::__ops::less());\n }\n \n /**\n@@ -3281,8 +3272,7 @@ _GLIBCXX_END_INLINE_ABI_NAMESPACE(_V2)\n __glibcxx_requires_valid_range(__first, __last);\n __glibcxx_requires_irreflexive_pred(__first, __last, __comp);\n \n- return std::__is_sorted_until(__first, __last,\n-\t\t\t\t __gnu_cxx::__ops::__iter_comp_iter(__comp));\n+ return std::__is_sorted_until(__first, __last, __comp);\n }\n \n /**\n@@ -4691,7 +4681,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO\n __glibcxx_requires_irreflexive(__first, __last);\n \n std::__partial_sort(__first, __middle, __last,\n-\t\t\t __gnu_cxx::__ops::__iter_less_iter());\n+\t\t\t __gnu_cxx::__ops::less());\n }\n \n /**\n@@ -4731,8 +4721,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO\n __glibcxx_requires_valid_range(__middle, __last);\n __glibcxx_requires_irreflexive_pred(__first, __last, __comp);\n \n- std::__partial_sort(__first, __middle, __last,\n-\t\t\t __gnu_cxx::__ops::__iter_comp_iter(__comp));\n+ std::__partial_sort(__first, __middle, __last, __comp);\n }\n \n /**\n@@ -4770,7 +4759,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO\n \n std::__introselect(__first, __nth, __last,\n \t\t\t std::__lg(__last - __first) * 2,\n-\t\t\t __gnu_cxx::__ops::__iter_less_iter());\n+\t\t\t __gnu_cxx::__ops::less());\n }\n \n /**\n@@ -4811,7 +4800,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO\n \n std::__introselect(__first, __nth, __last,\n \t\t\t std::__lg(__last - __first) * 2,\n-\t\t\t __gnu_cxx::__ops::__iter_comp_iter(__comp));\n+\t\t\t __comp);\n }\n \n /**\n@@ -4841,7 +4830,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO\n __glibcxx_requires_valid_range(__first, __last);\n __glibcxx_requires_irreflexive(__first, __last);\n \n- std::__sort(__first, __last, __gnu_cxx::__ops::__iter_less_iter());\n+ std::__sort(__first, __last, __gnu_cxx::__ops::less());\n }\n \n /**\n@@ -4874,7 +4863,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO\n __glibcxx_requires_valid_range(__first, __last);\n __glibcxx_requires_irreflexive_pred(__first, __last, __comp);\n \n- std::__sort(__first, __last, __gnu_cxx::__ops::__iter_comp_iter(__comp));\n+ std::__sort(__first, __last, __comp);\n }\n \n template<typename _InputIterator1, typename _InputIterator2,\n@@ -5070,7 +5059,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO\n __glibcxx_requires_irreflexive(__first, __last);\n \n _GLIBCXX_STD_A::__stable_sort(__first, __last,\n-\t\t\t\t __gnu_cxx::__ops::__iter_less_iter());\n+\t\t\t\t __gnu_cxx::__ops::less());\n }\n \n /**\n@@ -5106,8 +5095,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO\n __glibcxx_requires_valid_range(__first, __last);\n __glibcxx_requires_irreflexive_pred(__first, __last, __comp);\n \n- _GLIBCXX_STD_A::__stable_sort(__first, __last,\n-\t\t\t\t __gnu_cxx::__ops::__iter_comp_iter(__comp));\n+ _GLIBCXX_STD_A::__stable_sort(__first, __last, __comp);\n }\n \n template<typename _InputIterator1, typename _InputIterator2,\ndiff --git a/libstdc++-v3/include/bits/stl_heap.h b/libstdc++-v3/include/bits/stl_heap.h\nindex f2b1e87e42a8..b10495bc8052 100644\n--- a/libstdc++-v3/include/bits/stl_heap.h\n+++ b/libstdc++-v3/include/bits/stl_heap.h\n@@ -85,7 +85,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION\n _Distance __parent = 0;\n for (_Distance __child = 1; __child < __n; ++__child)\n \t{\n-\t if (__comp(__first + __parent, __first + __child))\n+\t if (__comp(__first[__parent], __first[__child]))\n \t return __child;\n \t if ((__child & 1) == 0)\n \t ++__parent;\n@@ -101,7 +101,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION\n __is_heap(_RandomAccessIterator __first, _Distance __n)\n {\n typename iterator_traits<_RandomAccessIterator>::difference_type __d(__n);\n- __gnu_cxx::__ops::_Iter_less_iter __comp;\n+ __gnu_cxx::__ops::less __comp;\n return std::__is_heap_until(__first, __d, __comp) == __n;\n }\n \n@@ -112,9 +112,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION\n __is_heap(_RandomAccessIterator __first, _Compare __comp, _Distance __n)\n {\n typename iterator_traits<_RandomAccessIterator>::difference_type __d(__n);\n- typedef __decltype(__comp) _Cmp;\n- __gnu_cxx::__ops::_Iter_comp_iter<_Cmp> __cmp(_GLIBCXX_MOVE(__comp));\n- return std::__is_heap_until(__first, __d, __cmp) == __n;\n+ return std::__is_heap_until(__first, __d, __comp) == __n;\n }\n \n template<typename _RandomAccessIterator>\n@@ -145,7 +143,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION\n \t\t_Compare& __comp)\n {\n _Distance __parent = (__holeIndex - 1) / 2;\n- while (__holeIndex > __topIndex && __comp(__first + __parent, __value))\n+ while (__holeIndex > __topIndex && __comp(__first[__parent], __value))\n \t{\n \t *(__first + __holeIndex) = _GLIBCXX_MOVE(*(__first + __parent));\n \t __holeIndex = __parent;\n@@ -182,7 +180,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION\n __glibcxx_requires_irreflexive(__first, __last);\n __glibcxx_requires_heap(__first, __last - _DistanceType(1));\n \n- __gnu_cxx::__ops::_Iter_less_val __comp;\n+ __gnu_cxx::__ops::less __comp;\n _ValueType __value = _GLIBCXX_MOVE(*(__last - _DistanceType(1)));\n std::__push_heap(__first, _DistanceType((__last - __first) - 1),\n \t\t _DistanceType(0), _GLIBCXX_MOVE(__value), __comp);\n@@ -218,11 +216,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION\n __glibcxx_requires_irreflexive_pred(__first, __last, __comp);\n __glibcxx_requires_heap_pred(__first, __last - _DistanceType(1), __comp);\n \n- __decltype(__gnu_cxx::__ops::__iter_comp_val(_GLIBCXX_MOVE(__comp)))\n-\t__cmp(_GLIBCXX_MOVE(__comp));\n _ValueType __value = _GLIBCXX_MOVE(*(__last - _DistanceType(1)));\n std::__push_heap(__first, _DistanceType((__last - __first) - 1),\n-\t\t _DistanceType(0), _GLIBCXX_MOVE(__value), __cmp);\n+\t\t _DistanceType(0), _GLIBCXX_MOVE(__value), __comp);\n }\n \n template<typename _RandomAccessIterator, typename _Distance,\n@@ -237,8 +233,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION\n while (__secondChild < (__len - 1) / 2)\n \t{\n \t __secondChild = 2 * (__secondChild + 1);\n-\t if (__comp(__first + __secondChild,\n-\t\t __first + (__secondChild - 1)))\n+\t if (__comp(__first[__secondChild],\n+\t\t __first[__secondChild - 1]))\n \t __secondChild--;\n \t *(__first + __holeIndex) = _GLIBCXX_MOVE(*(__first + __secondChild));\n \t __holeIndex = __secondChild;\n@@ -250,10 +246,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION\n \t\t\t\t\t\t + (__secondChild - 1)));\n \t __holeIndex = __secondChild - 1;\n \t}\n- __decltype(__gnu_cxx::__ops::__iter_comp_val(_GLIBCXX_MOVE(__comp)))\n-\t__cmp(_GLIBCXX_MOVE(__comp));\n std::__push_heap(__first, __holeIndex, __topIndex,\n-\t\t _GLIBCXX_MOVE(__value), __cmp);\n+\t\t _GLIBCXX_MOVE(__value), __comp);\n }\n \n template<typename _RandomAccessIterator, typename _Compare>\n@@ -303,7 +297,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION\n if (__last - __first > 1)\n \t{\n \t --__last;\n-\t __gnu_cxx::__ops::_Iter_less_iter __comp;\n+\t __gnu_cxx::__ops::less __comp;\n \t std::__pop_heap(__first, __last, __last, __comp);\n \t}\n }\n@@ -335,10 +329,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION\n \n if (__last - __first > 1)\n \t{\n-\t typedef __decltype(__comp) _Cmp;\n-\t __gnu_cxx::__ops::_Iter_comp_iter<_Cmp> __cmp(_GLIBCXX_MOVE(__comp));\n \t --__last;\n-\t std::__pop_heap(__first, __last, __last, __cmp);\n+\t std::__pop_heap(__first, __last, __last, __comp);\n \t}\n }\n \n@@ -390,7 +382,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION\n __glibcxx_requires_valid_range(__first, __last);\n __glibcxx_requires_irreflexive(__first, __last);\n \n- __gnu_cxx::__ops::_Iter_less_iter __comp;\n+ __gnu_cxx::__ops::less __comp;\n std::__make_heap(__first, __last, __comp);\n }\n \n@@ -416,9 +408,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION\n __glibcxx_requires_valid_range(__first, __last);\n __glibcxx_requires_irreflexive_pred(__first, __last, __comp);\n \n- typedef __decltype(__comp) _Cmp;\n- __gnu_cxx::__ops::_Iter_comp_iter<_Cmp> __cmp(_GLIBCXX_MOVE(__comp));\n- std::__make_heap(__first, __last, __cmp);\n+ std::__make_heap(__first, __last, __comp);\n }\n \n template<typename _RandomAccessIterator, typename _Compare>\n@@ -456,7 +446,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION\n __glibcxx_requires_irreflexive(__first, __last);\n __glibcxx_requires_heap(__first, __last);\n \n- __gnu_cxx::__ops::_Iter_less_iter __comp;\n+ __gnu_cxx::__ops::less __comp;\n std::__sort_heap(__first, __last, __comp);\n }\n \n@@ -483,9 +473,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION\n __glibcxx_requires_irreflexive_pred(__first, __last, __comp);\n __glibcxx_requires_heap_pred(__first, __last, __comp);\n \n- typedef __decltype(__comp) _Cmp;\n- __gnu_cxx::__ops::_Iter_comp_iter<_Cmp> __cmp(_GLIBCXX_MOVE(__comp));\n- std::__sort_heap(__first, __last, __cmp);\n+ std::__sort_heap(__first, __last, __comp);\n }\n \n #if __cplusplus >= 201103L\n@@ -512,7 +500,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION\n __glibcxx_requires_valid_range(__first, __last);\n __glibcxx_requires_irreflexive(__first, __last);\n \n- __gnu_cxx::__ops::_Iter_less_iter __comp;\n+ __gnu_cxx::__ops::less __comp;\n return __first +\n \tstd::__is_heap_until(__first, std::distance(__first, __last), __comp);\n }\n@@ -540,10 +528,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION\n __glibcxx_requires_valid_range(__first, __last);\n __glibcxx_requires_irreflexive_pred(__first, __last, __comp);\n \n- typedef __decltype(__comp) _Cmp;\n- __gnu_cxx::__ops::_Iter_comp_iter<_Cmp> __cmp(_GLIBCXX_MOVE(__comp));\n return __first\n-\t+ std::__is_heap_until(__first, std::distance(__first, __last), __cmp);\n+\t+ std::__is_heap_until(__first, std::distance(__first, __last),\n+\t\t\t __comp);\n }\n \n /**\n@@ -580,9 +567,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION\n __glibcxx_requires_irreflexive_pred(__first, __last, __comp);\n \n const auto __dist = std::distance(__first, __last);\n- typedef __decltype(__comp) _Cmp;\n- __gnu_cxx::__ops::_Iter_comp_iter<_Cmp> __cmp(_GLIBCXX_MOVE(__comp));\n- return std::__is_heap_until(__first, __dist, __cmp) == __dist;\n+ return std::__is_heap_until(__first, __dist, __comp) == __dist;\n }\n #endif\n \n", "prefixes": [ "v1", "08/12" ] }