aboutsummaryrefslogtreecommitdiff
path: root/libstdc++-v3/include/bits/regex.h
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2014-09-11 11:01:20 +0100
committerJonathan Wakely <redi@gcc.gnu.org>2014-09-11 11:01:20 +0100
commit8aed2f2f63cebce1fc0c9af95df68c2d7efc52a3 (patch)
tree7c2a608dd2b5c67bf802eb639245882f076d5c05 /libstdc++-v3/include/bits/regex.h
parent21a16932df04c0745673815c29cd8fb52988f671 (diff)
downloadgcc-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
Diffstat (limited to 'libstdc++-v3/include/bits/regex.h')
-rw-r--r--libstdc++-v3/include/bits/regex.h2
1 files changed, 1 insertions, 1 deletions
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