]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
libstdc++: Fix more unqualified uses of make_pair
authorJonathan Wakely <jwakely@redhat.com>
Wed, 12 Feb 2025 18:33:46 +0000 (18:33 +0000)
committerJonathan Wakely <redi@gcc.gnu.org>
Fri, 14 Feb 2025 15:33:12 +0000 (15:33 +0000)
There are some unqualified calls to make_pair in Parallel Mode. Fix
these by just using a qualified call, because it's simpler and I don't
care about this code much.

libstdc++-v3/ChangeLog:

* include/parallel/algobase.h (__mismatch_switch): Qualify calls
to make_pair to avoid ADL.

libstdc++-v3/include/parallel/algobase.h

index a47230c8b937fa0005ee299eb5469917b0328c2e..0f3b979a8f20970b9077182b0614fb7d642e3257 100644 (file)
@@ -84,7 +84,7 @@ namespace __parallel
             __gnu_parallel::__find_template(__begin1, __end1, __begin2, __pred,
                                             __gnu_parallel::
                                             __mismatch_selector()).first;
-          return make_pair(__res , __begin2 + (__res - __begin1));
+          return std::make_pair(__res , __begin2 + (__res - __begin1));
         }
       else
         return _GLIBCXX_STD_A::mismatch(__begin1, __end1, __begin2, __pred);
@@ -165,7 +165,7 @@ namespace __parallel
             __gnu_parallel::__find_template(__begin1, __end1, __begin2, __pred,
                                             __gnu_parallel::
                                             __mismatch_selector()).first;
-          return make_pair(__res , __begin2 + (__res - __begin1));
+          return std::make_pair(__res , __begin2 + (__res - __begin1));
         }
       else
         return _GLIBCXX_STD_A::mismatch(__begin1, __end1,