[PATCH 1/2] Replace use of C++14 std::exchange in C++11 testcase

Jonathan Wakely jwakely@redhat.com
Wed Dec 7 15:27:00 GMT 2016


This test fails when run with -std=gnu++11

	* testsuite/28_regex/traits/char/user_defined.cc: Replace uses of
	C++14 std::exchange function.

Tested x86_64-linux, committed to trunk.

-------------- next part --------------
commit 897fb3679fda13a8ebda39cf8a60810b03f09e06
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Wed Dec 7 14:25:34 2016 +0000

    Replace use of C++14 std::exchange in C++11 testcase
    
    	* testsuite/28_regex/traits/char/user_defined.cc: Replace uses of
    	C++14 std::exchange function.

diff --git a/libstdc++-v3/testsuite/28_regex/traits/char/user_defined.cc b/libstdc++-v3/testsuite/28_regex/traits/char/user_defined.cc
index 5888ce1..d4f4abc 100644
--- a/libstdc++-v3/testsuite/28_regex/traits/char/user_defined.cc
+++ b/libstdc++-v3/testsuite/28_regex/traits/char/user_defined.cc
@@ -72,13 +72,15 @@ test01()
     VERIFY(!called_transform);
     basic_regex<char, MyRegexTraits<char>> re("[a]", regex::collate);
     VERIFY(regex_match("a", re));
-    VERIFY(exchange(called_transform, false));
+    VERIFY(called_transform);
+    called_transform = false;
   }
   {
     VERIFY(!called_nocase);
     basic_regex<char, MyRegexTraits<char>> re("[a]", regex::icase);
     VERIFY(regex_match("A", re));
-    VERIFY(exchange(called_nocase, false));
+    VERIFY(called_nocase);
+    called_nocase = false;
   }
   {
     basic_regex<char, MyRegexTraits<char>> re("[T-f]", regex::icase);


More information about the Libstdc++ mailing list