diff options
| author | Tim Shen <timshen@google.com> | 2015-01-09 03:58:59 +0000 |
|---|---|---|
| committer | Tim Shen <timshen@gcc.gnu.org> | 2015-01-09 03:58:59 +0000 |
| commit | a8e67466d35f12aa7997363984f97a35e2a40eba (patch) | |
| tree | 4bf54a771ccb3f56af5d6f86fe0077e257be1959 /libstdc++-v3 | |
| parent | e608ef6de92f53558b27b3166d5da5ea3725461d (diff) | |
| download | gcc-a8e67466d35f12aa7997363984f97a35e2a40eba.zip gcc-a8e67466d35f12aa7997363984f97a35e2a40eba.tar.gz gcc-a8e67466d35f12aa7997363984f97a35e2a40eba.tar.bz2 | |
re PR libstdc++/64239 (regex_iterator::operator= should copy match_results::position)
PR libstdc++/64239
* include/bits/regex.h (match_results<>::swap): Use std::swap
instead of swap.
* include/bits/regex_compiler.tcc (_Compiler<>::_M_quantifier):
Likewise.
* testsuite/28_regex/match_results/swap.cc: New testcase.
From-SVN: r219373
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 9 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/regex.h | 1 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/regex_compiler.tcc | 2 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/28_regex/match_results/swap.cc | 43 |
4 files changed, 54 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 85b08fa..50c74af 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,12 @@ +2015-01-09 Tim Shen <timshen@google.com> + + PR libstdc++/64239 + * include/bits/regex.h (match_results<>::swap): Use std::swap + instead of swap. + * include/bits/regex_compiler.tcc (_Compiler<>::_M_quantifier): + Likewise. + * testsuite/28_regex/match_results/swap.cc: New testcase. + 2015-01-08 Jonathan Wakely <jwakely@redhat.com> PR libstdc++/60132 diff --git a/libstdc++-v3/include/bits/regex.h b/libstdc++-v3/include/bits/regex.h index 9b7ed8c..52c2384 100644 --- a/libstdc++-v3/include/bits/regex.h +++ b/libstdc++-v3/include/bits/regex.h @@ -1863,6 +1863,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 void swap(match_results& __that) { + using std::swap; _Base_type::swap(__that); swap(_M_begin, __that._M_begin); } diff --git a/libstdc++-v3/include/bits/regex_compiler.tcc b/libstdc++-v3/include/bits/regex_compiler.tcc index 57bafa3..33d7118 100644 --- a/libstdc++-v3/include/bits/regex_compiler.tcc +++ b/libstdc++-v3/include/bits/regex_compiler.tcc @@ -276,7 +276,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { auto& __tmp = (*_M_nfa)[__stack.top()]; __stack.pop(); - swap(__tmp._M_next, __tmp._M_alt); + std::swap(__tmp._M_next, __tmp._M_alt); } } _M_stack.push(__e); diff --git a/libstdc++-v3/testsuite/28_regex/match_results/swap.cc b/libstdc++-v3/testsuite/28_regex/match_results/swap.cc new file mode 100644 index 0000000..18248c1 --- /dev/null +++ b/libstdc++-v3/testsuite/28_regex/match_results/swap.cc @@ -0,0 +1,43 @@ +// { dg-options "-std=gnu++11" } + +// +// Copyright (C) 2015 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// <http://www.gnu.org/licenses/>. + +#include <regex> +#include <testsuite_hooks.h> + +void +test01() +{ + bool test __attribute__((unused)) = true; + + std::cmatch m; + std::regex_match("a", m, std::regex("a")); + std::cmatch mm1 = m, mm2; + mm1.swap(mm2); + VERIFY(m == mm2); + std::swap(mm1, mm2); + VERIFY(m == mm1); +} + +int +main() +{ + test01(); + return 0; +} |