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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index ca453a9f296c4e42053684c44d55ce50759939b6..80abfa8da1c0ed7291e05e8be71b126b810bc9e7 100644 (file)
--- 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 3420f10b18b7aa43708fcac7e7be874c7bedffc7..172ea8303f64e0577a325dd4e549cff97742334e 100644 (file)
--- 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 128a92c2f0d8c5a79598712908d4c149cd9f7204..0576422b5d91900e6d67a9b7436d1b0cbb42de05 100644 (file)
--- 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,