aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Carlini <paolo.carlini@oracle.com>2008-09-21 09:36:27 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2008-09-21 09:36:27 +0000
commitaa4652fac00c70ea32498ba2d1fb939e9fc0e274 (patch)
treecb699c1b2a311ab5af19d6aa0cc553a1faa6a685
parent5abf386014d3f91ce41b3a946857587082a014b4 (diff)
downloadgcc-aa4652fac00c70ea32498ba2d1fb939e9fc0e274.zip
gcc-aa4652fac00c70ea32498ba2d1fb939e9fc0e274.tar.gz
gcc-aa4652fac00c70ea32498ba2d1fb939e9fc0e274.tar.bz2
stl_algo.h (minmax(initializer_list<>): Use make_pair, consistently with the other overload for initializer_list.
2008-09-21 Paolo Carlini <paolo.carlini@oracle.com> * include/bits/stl_algo.h (minmax(initializer_list<>): Use make_pair, consistently with the other overload for initializer_list. From-SVN: r140524
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/include/bits/stl_algo.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 99340ec..cbb6671 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-21 Paolo Carlini <paolo.carlini@oracle.com>
+
+ * include/bits/stl_algo.h (minmax(initializer_list<>): Use make_pair,
+ consistently with the other overload for initializer_list.
+
2008-09-19 Johannes Singler <singler@ira.uka.de>
PR libstdc++/37470
diff --git a/libstdc++-v3/include/bits/stl_algo.h b/libstdc++-v3/include/bits/stl_algo.h
index 373881c..d956376 100644
--- a/libstdc++-v3/include/bits/stl_algo.h
+++ b/libstdc++-v3/include/bits/stl_algo.h
@@ -4121,7 +4121,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
{
pair<const _Tp*, const _Tp*> __p =
std::minmax_element(__l.begin(), __l.end());
- return std::pair<_Tp, _Tp>(*__p.first, *__p.second);
+ return std::make_pair(*__p.first, *__p.second);
}
template<typename _Tp, typename _Compare>