diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2016-12-07 15:22:57 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2016-12-07 15:22:57 +0000 |
| commit | d71f5aa799d0cce6863147512dd14db4b1763ad2 (patch) | |
| tree | 84df55779dd2aa04649f1cbfafeb10692600497f | |
| parent | 1f153a1d2a97feaca914787f3d08b7d952b4bfe0 (diff) | |
| download | gcc-d71f5aa799d0cce6863147512dd14db4b1763ad2.zip gcc-d71f5aa799d0cce6863147512dd14db4b1763ad2.tar.gz gcc-d71f5aa799d0cce6863147512dd14db4b1763ad2.tar.bz2 | |
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.
From-SVN: r243354
| -rw-r--r-- | libstdc++-v3/ChangeLog | 3 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/28_regex/traits/char/user_defined.cc | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index c102e60..6012328 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,8 @@ 2016-12-07 Jonathan Wakely <jwakely@redhat.com> + * testsuite/28_regex/traits/char/user_defined.cc: Replace uses of + C++14 std::exchange function. + * testsuite/util/testsuite_hooks.h (THROW): Define. * testsuite/util/replacement_memory_operators.h: Include testsuite_hooks.h and use THROW macro. 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); |