diff options
| author | Tim Shen <timshen91@gmail.com> | 2013-10-17 20:46:50 +0000 |
|---|---|---|
| committer | Tim Shen <timshen@gcc.gnu.org> | 2013-10-17 20:46:50 +0000 |
| commit | ab1c993b94cc09cf569f75c34c943f6e695a0ec3 (patch) | |
| tree | 77c6c62f2454b98891ae2a05692b8bb9114f3b8d /libstdc++-v3/include/bits/regex.h | |
| parent | 358e1993d0b76b2643aee7565e2c5aef38a369ae (diff) | |
| download | gcc-ab1c993b94cc09cf569f75c34c943f6e695a0ec3.zip gcc-ab1c993b94cc09cf569f75c34c943f6e695a0ec3.tar.gz gcc-ab1c993b94cc09cf569f75c34c943f6e695a0ec3.tar.bz2 | |
regex.h (regex_token_iterator<>::regex_token_iterator): Fix initialization orders in initialization list and add explicit braces for...
2013-10-17 Tim Shen <timshen91@gmail.com>
* include/bits/regex.h (regex_token_iterator<>::regex_token_iterator):
Fix initialization orders in initialization list and add explicit braces
for potentially ambiguous(actually not) `else` branch to eliminate
warnings.
* include/bits/regex_automaton.h (_NFA<>::_NFA): Likewise.
* include/bits/regex_compiler.h (_CharMatcher<>::_CharMatcher,
_BracketMatcher<>::_BracketMatcher): Likewise.
* include/bits/regex_compiler.tcc (_Compiler<>::_Compiler,
_Compiler<>::_M_atom): Likewise.
* include/bits/regex_executor.h (_Executor<>::_Executor): Likewise.
* include/bits/regex_executor.tcc (_DFSExecutor<>::_M_dfs,
_Executor<>::_M_word_boundry): Likewise.
* include/bits/regex_scanner.tcc (_Scanner<>::_Scanner,
_Scanner<>::_M_eat_class): Likewise.
* include/bits/regex.tcc (__regex_algo_impl<>,
regex_iterator<>::operator++): Likewise, and remove unused typedef.
From-SVN: r203798
Diffstat (limited to 'libstdc++-v3/include/bits/regex.h')
| -rw-r--r-- | libstdc++-v3/include/bits/regex.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libstdc++-v3/include/bits/regex.h b/libstdc++-v3/include/bits/regex.h index 172ea83..5d1a8f4 100644 --- a/libstdc++-v3/include/bits/regex.h +++ b/libstdc++-v3/include/bits/regex.h @@ -2514,7 +2514,7 @@ _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_subs(), _M_suffix(), _M_n(0), _M_result(nullptr), _M_has_m1(false) { } @@ -2601,7 +2601,7 @@ _GLIBCXX_END_NAMESPACE_VERSION */ regex_token_iterator(const regex_token_iterator& __rhs) : _M_position(__rhs._M_position), _M_subs(__rhs._M_subs), - _M_n(__rhs._M_n), _M_result(__rhs._M_result), _M_suffix(__rhs._M_suffix), + _M_suffix(__rhs._M_suffix), _M_n(__rhs._M_n), _M_result(__rhs._M_result), _M_has_m1(__rhs._M_has_m1) { if (__rhs._M_result == &__rhs._M_suffix) @@ -2679,10 +2679,10 @@ _GLIBCXX_END_NAMESPACE_VERSION { return _M_result == nullptr; } _Position _M_position; - const value_type* _M_result; + std::vector<int> _M_subs; value_type _M_suffix; std::size_t _M_n; - std::vector<int> _M_subs; + const value_type* _M_result; // Show whether _M_subs contains -1 bool _M_has_m1; |