mirror of git://gcc.gnu.org/git/gcc.git
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
This commit is contained in:
parent
7ab4168e31
commit
703344ca91
|
|
@ -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>
|
2013-10-15 Diego Novillo <dnovillo@google.com>
|
||||||
|
|
||||||
* testsuite/20_util/exchange/1.cc: Add missing function
|
* testsuite/20_util/exchange/1.cc: Add missing function
|
||||||
|
|
|
||||||
|
|
@ -2514,7 +2514,8 @@ _GLIBCXX_END_NAMESPACE_VERSION
|
||||||
* iterator of the same type.
|
* iterator of the same type.
|
||||||
*/
|
*/
|
||||||
regex_token_iterator()
|
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)
|
||||||
{ }
|
{ }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -589,6 +589,7 @@ _GLIBCXX_END_NAMESPACE_VERSION
|
||||||
_M_has_m1 = __rhs._M_has_m1;
|
_M_has_m1 = __rhs._M_has_m1;
|
||||||
if (__rhs._M_result == &__rhs._M_suffix)
|
if (__rhs._M_result == &__rhs._M_suffix)
|
||||||
_M_result = &_M_suffix;
|
_M_result = &_M_suffix;
|
||||||
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename _Bi_iter,
|
template<typename _Bi_iter,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue