diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2009-06-30 12:09:57 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2009-06-30 12:09:57 +0000 |
| commit | a0560e75a75fb91523c03d6a75dcf0549275736a (patch) | |
| tree | 5a45cf6cde16e78db55e4275644066ee97065b85 | |
| parent | d8dc68cb63a94396d581dde247de63807582d66a (diff) | |
| download | gcc-a0560e75a75fb91523c03d6a75dcf0549275736a.zip gcc-a0560e75a75fb91523c03d6a75dcf0549275736a.tar.gz gcc-a0560e75a75fb91523c03d6a75dcf0549275736a.tar.bz2 | |
re PR libstdc++/40600 (pair& operator=(pair&& __p) doesn't work without inlining)
2009-06-30 Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/40600
* testsuite/25_algorithms/minmax/2.cc: Fix consistently with
std::minmax return type.
* testsuite/25_algorithms/minmax/3.cc: Likewise.
From-SVN: r149094
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/25_algorithms/minmax/2.cc | 20 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/25_algorithms/minmax/3.cc | 4 |
3 files changed, 19 insertions, 12 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 7b12556..963bc23 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,12 @@ 2009-06-30 Paolo Carlini <paolo.carlini@oracle.com> + PR libstdc++/40600 + * testsuite/25_algorithms/minmax/2.cc: Fix consistently with + std::minmax return type. + * testsuite/25_algorithms/minmax/3.cc: Likewise. + +2009-06-30 Paolo Carlini <paolo.carlini@oracle.com> + PR libstdc++/40511 * config/locale/gnu/c_locale.cc: Don't use LC_CTYPE_MASK together with glibc2.2.x. diff --git a/libstdc++-v3/testsuite/25_algorithms/minmax/2.cc b/libstdc++-v3/testsuite/25_algorithms/minmax/2.cc index 9818c5c..6c4200e 100644 --- a/libstdc++-v3/testsuite/25_algorithms/minmax/2.cc +++ b/libstdc++-v3/testsuite/25_algorithms/minmax/2.cc @@ -27,25 +27,25 @@ void test01() { bool test __attribute__((unused)) = true; - std::pair<const int&, const int&> z = std::minmax({1, 2, 3}); - std::pair<const int&, const int&> w = std::minmax({4, 3, 5, 4}); - std::pair<const int&, const int&> y = std::minmax({4, 5, 3, 7, 3}); + std::pair<int, int> z = std::minmax({1, 2, 3}); + std::pair<int, int> w = std::minmax({4, 3, 5, 4}); + std::pair<int, int> y = std::minmax({4, 5, 3, 7, 3}); VERIFY( z.first == 1 ); VERIFY( z.second == 3 ); VERIFY( w.first == 3 ); VERIFY( w.second == 5 ); VERIFY( y.first == 3 ); VERIFY( y.second == 7 ); - - std::pair<const int&, const int&> zc = + + std::pair<int, int> zc = std::minmax({1, 2, 3}, std::greater<int>()); - - std::pair<const int&, const int&> wc = + + std::pair<int, int> wc = std::minmax({4, 3, 5, 4}, std::greater<int>()); - - std::pair<const int&, const int&> yc = + + std::pair<int, int> yc = std::minmax({4, 5, 3, 7, 3}, std::greater<int>()); - + VERIFY( zc.first == 3 ); VERIFY( zc.second == 1 ); VERIFY( wc.first == 5 ); diff --git a/libstdc++-v3/testsuite/25_algorithms/minmax/3.cc b/libstdc++-v3/testsuite/25_algorithms/minmax/3.cc index 5e896e2..f0944b0 100644 --- a/libstdc++-v3/testsuite/25_algorithms/minmax/3.cc +++ b/libstdc++-v3/testsuite/25_algorithms/minmax/3.cc @@ -41,8 +41,8 @@ void test01() { bool test __attribute__((unused)) = true; - std::pair<const int&, const int&> z = std::minmax({1, 2, 3, 4, 5, 6, 7, 8}, - compare_counter()); + std::pair<int, int> z = std::minmax({1, 2, 3, 4, 5, 6, 7, 8}, + compare_counter()); // If N is the number of arguments in the minmax function call, // 25.3.7 specifies that at most 3N/2 comparisons are allowed. |