From 8aed2f2f63cebce1fc0c9af95df68c2d7efc52a3 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 11 Sep 2014 11:01:20 +0100 Subject: 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 --- libstdc++-v3/include/bits/regex.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libstdc++-v3/include/bits/regex.h') 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 + template basic_string format(const basic_string& __fmt, match_flag_type __flags = regex_constants::format_default) const -- cgit v1.1