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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@149094 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 7b12556..963bc23 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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.