diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2014-09-11 11:01:20 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2014-09-11 11:01:20 +0100 |
| commit | 8aed2f2f63cebce1fc0c9af95df68c2d7efc52a3 (patch) | |
| tree | 7c2a608dd2b5c67bf802eb639245882f076d5c05 | |
| parent | 21a16932df04c0745673815c29cd8fb52988f671 (diff) | |
| download | gcc-8aed2f2f63cebce1fc0c9af95df68c2d7efc52a3.zip gcc-8aed2f2f63cebce1fc0c9af95df68c2d7efc52a3.tar.gz gcc-8aed2f2f63cebce1fc0c9af95df68c2d7efc52a3.tar.bz2 | |
re PR libstdc++/63219 (Superfluous template parameter in match_result::format overload)
PR libstdc++/63219
* include/bits/regex.h (match_results::format): Remove stray template
parameter.
* include/bits/regex_compiler.h (_RegexTranslator::_RegexTranslator):
Remove parameter name to avoid -Wunused-parameter warning.
* include/bits/regex_executor.h (_State_info::_State_info): Reorder
mem-initializers to avoid -Wreorder warning.
* include/bits/regex_executor.tcc (_Executor::_M_word_boundary):
Remove parameter name to avoid -Wunused-parameter warning.
* include/bits/regex_scanner.tcc (_Scanner::_M_advance): Add braces
to avoid -Wempty-body warning when not in debug mode.
From-SVN: r215160
| -rw-r--r-- | libstdc++-v3/ChangeLog | 14 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/regex.h | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/regex_compiler.h | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/regex_executor.h | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/regex_executor.tcc | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/regex_scanner.tcc | 4 |
6 files changed, 21 insertions, 5 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 79ddf35..29fdb56 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,17 @@ +2014-09-11 Jonathan Wakely <jwakely@redhat.com> + + PR libstdc++/63219 + * include/bits/regex.h (match_results::format): Remove stray template + parameter. + * include/bits/regex_compiler.h (_RegexTranslator::_RegexTranslator): + Remove parameter name to avoid -Wunused-parameter warning. + * include/bits/regex_executor.h (_State_info::_State_info): Reorder + mem-initializers to avoid -Wreorder warning. + * include/bits/regex_executor.tcc (_Executor::_M_word_boundary): + Remove parameter name to avoid -Wunused-parameter warning. + * include/bits/regex_scanner.tcc (_Scanner::_M_advance): Add braces + to avoid -Wempty-body warning when not in debug mode. + 2014-09-10 Siva Chandra Reddy <sivachandra@google.com> * python/hook.in: Load the xmethods. diff --git a/libstdc++-v3/include/bits/regex.h b/libstdc++-v3/include/bits/regex.h index e556350..9dc83fd 100644 --- a/libstdc++-v3/include/bits/regex.h +++ b/libstdc++-v3/include/bits/regex.h @@ -1814,7 +1814,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /** * @pre ready() == true */ - template<typename _Out_iter, typename _St, typename _Sa> + template<typename _St, typename _Sa> basic_string<char_type, _St, _Sa> format(const basic_string<char_type, _St, _Sa>& __fmt, match_flag_type __flags = regex_constants::format_default) const diff --git a/libstdc++-v3/include/bits/regex_compiler.h b/libstdc++-v3/include/bits/regex_compiler.h index ca116de..1193a5a 100644 --- a/libstdc++-v3/include/bits/regex_compiler.h +++ b/libstdc++-v3/include/bits/regex_compiler.h @@ -212,7 +212,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION typedef _CharT _StrTransT; explicit - _RegexTranslator(const _TraitsT& __traits) + _RegexTranslator(const _TraitsT&) { } _CharT diff --git a/libstdc++-v3/include/bits/regex_executor.h b/libstdc++-v3/include/bits/regex_executor.h index 40d3443..130bc74 100644 --- a/libstdc++-v3/include/bits/regex_executor.h +++ b/libstdc++-v3/include/bits/regex_executor.h @@ -159,7 +159,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { explicit _State_info(_StateIdT __start, size_t __n) - : _M_start(__start), _M_visited_states(new bool[__n]()) + : _M_visited_states(new bool[__n]()), _M_start(__start) { } bool _M_visited(_StateIdT __i) diff --git a/libstdc++-v3/include/bits/regex_executor.tcc b/libstdc++-v3/include/bits/regex_executor.tcc index 3c68668..3ca7de3 100644 --- a/libstdc++-v3/include/bits/regex_executor.tcc +++ b/libstdc++-v3/include/bits/regex_executor.tcc @@ -407,7 +407,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<typename _BiIter, typename _Alloc, typename _TraitsT, bool __dfs_mode> bool _Executor<_BiIter, _Alloc, _TraitsT, __dfs_mode>:: - _M_word_boundary(_State<_TraitsT> __state) const + _M_word_boundary(_State<_TraitsT>) const { // By definition. bool __ans = false; diff --git a/libstdc++-v3/include/bits/regex_scanner.tcc b/libstdc++-v3/include/bits/regex_scanner.tcc index 818e47b..1dc2fd9 100644 --- a/libstdc++-v3/include/bits/regex_scanner.tcc +++ b/libstdc++-v3/include/bits/regex_scanner.tcc @@ -83,7 +83,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION else if (_M_state == _S_state_in_brace) _M_scan_in_brace(); else - _GLIBCXX_DEBUG_ASSERT(false); + { + _GLIBCXX_DEBUG_ASSERT(false); + } } // Differences between styles: |