diff options
| author | Tim Shen <timshen91@gmail.com> | 2013-10-16 22:28:28 +0000 |
|---|---|---|
| committer | Tim Shen <timshen@gcc.gnu.org> | 2013-10-16 22:28:28 +0000 |
| commit | 703344ca91aeb9ffce1070f3e713211248c83e94 (patch) | |
| tree | bbba18408cfc6920573c4680c7e00519404d85aa | |
| parent | 7ab4168e31fd3f5db44d8d91327febc7a62c991a (diff) | |
| download | gcc-703344ca91aeb9ffce1070f3e713211248c83e94.zip gcc-703344ca91aeb9ffce1070f3e713211248c83e94.tar.gz gcc-703344ca91aeb9ffce1070f3e713211248c83e94.tar.bz2 | |
regex.h (regex_token_iterator<>::regex_token_iterator): Add initialization for _M_has_m1.
2013-10-16 Tim Shen <timshen91@gmail.com>
* include/bits/regex.h (regex_token_iterator<>::regex_token_iterator):
Add initialization for _M_has_m1.
* include/bits/regex.tcc (regex_token_iterator<>::operator=): Add return
statment.
From-SVN: r203732
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/regex.h | 3 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/regex.tcc | 1 |
3 files changed, 10 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index ca453a9..80abfa8 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2013-10-16 Tim Shen <timshen91@gmail.com> + + * include/bits/regex.h (regex_token_iterator<>::regex_token_iterator): + Add initialization for _M_has_m1. + * include/bits/regex.tcc (regex_token_iterator<>::operator=): Add return + statment. + 2013-10-15 Diego Novillo <dnovillo@google.com> * testsuite/20_util/exchange/1.cc: Add missing function diff --git a/libstdc++-v3/include/bits/regex.h b/libstdc++-v3/include/bits/regex.h index 3420f10..172ea83 100644 --- a/libstdc++-v3/include/bits/regex.h +++ b/libstdc++-v3/include/bits/regex.h @@ -2514,7 +2514,8 @@ _GLIBCXX_END_NAMESPACE_VERSION * iterator of the same type. */ regex_token_iterator() - : _M_position(), _M_result(nullptr), _M_suffix(), _M_n(0), _M_subs() + : _M_position(), _M_result(nullptr), _M_suffix(), _M_n(0), _M_subs(), + _M_has_m1(false) { } /** diff --git a/libstdc++-v3/include/bits/regex.tcc b/libstdc++-v3/include/bits/regex.tcc index 128a92c..0576422 100644 --- a/libstdc++-v3/include/bits/regex.tcc +++ b/libstdc++-v3/include/bits/regex.tcc @@ -589,6 +589,7 @@ _GLIBCXX_END_NAMESPACE_VERSION _M_has_m1 = __rhs._M_has_m1; if (__rhs._M_result == &__rhs._M_suffix) _M_result = &_M_suffix; + return *this; } template<typename _Bi_iter, |