commit 51ba44d1bee122813902f9d495a0d3d9b9a72c12 Author: tim Date: Sat Oct 5 23:09:54 2013 -0400 2013-10-06 Tim Shen * include/bits/regex.h: (regex_token_iterator<>::regex_token_iterator): Fix compile error. * include/bits/regex.tcc: (regex_replace<>): Remove default parameter. diff --git a/libstdc++-v3/include/bits/regex.h b/libstdc++-v3/include/bits/regex.h index 23b2499..3420f10 100644 --- a/libstdc++-v3/include/bits/regex.h +++ b/libstdc++-v3/include/bits/regex.h @@ -2599,8 +2599,8 @@ _GLIBCXX_END_NAMESPACE_VERSION * @param __rhs [IN] A %regex_token_iterator to copy. */ regex_token_iterator(const regex_token_iterator& __rhs) - : _M_position(__rhs.position), _M_subs(__rhs.subs), _M_n(__rhs.N), - _M_result(__rhs.result), _M_suffix(__rhs.suffix), + : _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_has_m1(__rhs._M_has_m1) { if (__rhs._M_result == &__rhs._M_suffix) diff --git a/libstdc++-v3/include/bits/regex.tcc b/libstdc++-v3/include/bits/regex.tcc index edf3c3c..128a92c 100644 --- a/libstdc++-v3/include/bits/regex.tcc +++ b/libstdc++-v3/include/bits/regex.tcc @@ -478,8 +478,7 @@ _GLIBCXX_END_NAMESPACE_VERSION regex_replace(_Out_iter __out, _Bi_iter __first, _Bi_iter __last, const basic_regex<_Ch_type, _Rx_traits>& __e, const _Ch_type* __fmt, - regex_constants::match_flag_type __flags - = regex_constants::match_default) + regex_constants::match_flag_type __flags) { typedef regex_iterator<_Bi_iter, _Ch_type, _Rx_traits> _IterT; _IterT __i(__first, __last, __e, __flags);