From: Tim Shen Date: Wed, 16 Oct 2013 22:28:28 +0000 (+0000) Subject: regex.h (regex_token_iterator<>::regex_token_iterator): Add initialization for _M_has_m1. X-Git-Tag: releases/gcc-4.9.0~3417 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=703344ca91aeb9ffce1070f3e713211248c83e94;p=thirdparty%2Fgcc.git regex.h (regex_token_iterator<>::regex_token_iterator): Add initialization for _M_has_m1. 2013-10-16 Tim Shen * 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 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index ca453a9f296c..80abfa8da1c0 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2013-10-16 Tim Shen + + * 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 * 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 3420f10b18b7..172ea8303f64 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 128a92c2f0d8..0576422b5d91 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