From: Paolo Carlini <paolo.carlini@oracle.com>
Date: Tue, 30 Jun 2009 12:09:57 +0000 (+0000)
Subject: re PR libstdc++/40600 (pair& operator=(pair&& __p) doesn't work without inlining)
X-Git-Tag: releases/gcc-4.5.0~4857
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a0560e75a75fb91523c03d6a75dcf0549275736a;p=thirdparty%2Fgcc.git

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
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 7b125569f4ae..963bc23f3999 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+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
diff --git a/libstdc++-v3/testsuite/25_algorithms/minmax/2.cc b/libstdc++-v3/testsuite/25_algorithms/minmax/2.cc
index 9818c5ca1dd0..6c4200eeffbb 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 5e896e208f72..f0944b0bfde8 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.