From 3c9467e19779338efb347a4a27df53d016adb82c Mon Sep 17 00:00:00 2001 From: timshen Date: Wed, 31 Dec 2014 10:27:41 +0000 Subject: [PATCH] PR libstdc++/64441 * include/bits/regex.tcc (__regex_algo_impl): s/auto/auto&/. * include/bits/regex_executor.tcc (_Executor<>::_M_dfs): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@219121 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/include/bits/regex.tcc | 2 +- libstdc++-v3/include/bits/regex_executor.tcc | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 597473194034..cb01af039305 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2014-12-31 Tim Shen + + PR libstdc++/64441 + * include/bits/regex.tcc (__regex_algo_impl): s/auto/auto&/. + * include/bits/regex_executor.tcc (_Executor<>::_M_dfs): Likewise. + 2014-12-28 David Edelsohn * testsuite/26_numerics/headers/cmath/c99_classification_macros_c.cc: diff --git a/libstdc++-v3/include/bits/regex.tcc b/libstdc++-v3/include/bits/regex.tcc index 0206a6cf0e1f..b541446422b3 100644 --- a/libstdc++-v3/include/bits/regex.tcc +++ b/libstdc++-v3/include/bits/regex.tcc @@ -96,7 +96,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } if (__ret) { - for (auto __it : __res) + for (auto& __it : __res) if (!__it.matched) __it.first = __it.second = __e; auto& __pre = __res[__res.size()-2]; diff --git a/libstdc++-v3/include/bits/regex_executor.tcc b/libstdc++-v3/include/bits/regex_executor.tcc index a9736675bf60..7954d06eb3ff 100644 --- a/libstdc++-v3/include/bits/regex_executor.tcc +++ b/libstdc++-v3/include/bits/regex_executor.tcc @@ -310,7 +310,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION if (!__submatch.matched) break; auto __last = _M_current; - for (auto __tmp = __submatch.first; + for (auto& __tmp = __submatch.first; __last != _M_end && __tmp != __submatch.second; ++__tmp) ++__last; -- 2.47.2