[gcc r15-7530] libstdc++: Fix more unqualified uses of make_pair
Jonathan Wakely
redi@gcc.gnu.org
Fri Feb 14 16:04:05 GMT 2025
https://gcc.gnu.org/g:06724b6079b5ad983f7d29b39b4cc38cde0f37b3
commit r15-7530-g06724b6079b5ad983f7d29b39b4cc38cde0f37b3
Author: Jonathan Wakely <jwakely@redhat.com>
Date: Wed Feb 12 18:33:46 2025 +0000
libstdc++: Fix more unqualified uses of make_pair
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.
Diff:
---
libstdc++-v3/include/parallel/algobase.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libstdc++-v3/include/parallel/algobase.h b/libstdc++-v3/include/parallel/algobase.h
index a47230c8b937..0f3b979a8f20 100644
--- a/libstdc++-v3/include/parallel/algobase.h
+++ b/libstdc++-v3/include/parallel/algobase.h
@@ -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,
More information about the Libstdc++-cvs
mailing list