From e3cc64dec20832769406aa38cde83c7dd4194bf4 Mon Sep 17 00:00:00 2001
From: Ben Cheng <bccheng@google.com>
Date: Tue, 22 Apr 2014 13:33:12 -0700
Subject: [4.9] GCC 4.9.0 official release refresh

Change-Id: Ic99a7da8b44b789a48aeec93b33e93944d6e6767
---
 gcc-4.9/libstdc++-v3/testsuite/20_util/exchange/1.cc | 4 ++--
 gcc-4.9/libstdc++-v3/testsuite/20_util/pair/40925.cc | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'gcc-4.9/libstdc++-v3/testsuite/20_util')

diff --git a/gcc-4.9/libstdc++-v3/testsuite/20_util/exchange/1.cc b/gcc-4.9/libstdc++-v3/testsuite/20_util/exchange/1.cc
index 923920edd..2f8825d1e 100644
--- a/gcc-4.9/libstdc++-v3/testsuite/20_util/exchange/1.cc
+++ b/gcc-4.9/libstdc++-v3/testsuite/20_util/exchange/1.cc
@@ -78,8 +78,8 @@ void test04()
     To() = default;
     To(const To&) = default;
     To(const From&) = delete;
-    To& operator=(const From&) { value = 1; }
-    To& operator=(From&&) { value = 2; }
+    To& operator=(const From&) { value = 1; return *this; }
+    To& operator=(From&&) { value = 2; return *this; }
   };
 
   To t;
diff --git a/gcc-4.9/libstdc++-v3/testsuite/20_util/pair/40925.cc b/gcc-4.9/libstdc++-v3/testsuite/20_util/pair/40925.cc
index 599fd3875..5b34a626e 100644
--- a/gcc-4.9/libstdc++-v3/testsuite/20_util/pair/40925.cc
+++ b/gcc-4.9/libstdc++-v3/testsuite/20_util/pair/40925.cc
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 // { dg-do compile }
 
 // Copyright (C) 2009-2014 Free Software Foundation, Inc.
@@ -63,5 +63,5 @@ void test01()
   std::pair<move_only, int*> p15(move_only(), ip);
   std::pair<move_only, int X::*> p16(move_only(), mp);
 
-  std::pair<move_only, move_only> p17(move_only(), move_only());
+  std::pair<move_only, move_only> p17{move_only(), move_only()};
 }
-- 
cgit v1.2.3