OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Jonathan Wakely 2014-09-11 11:01:20 +01:00 committed by Jonathan Wakely
parent 21a16932df
commit 8aed2f2f63
6 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libstdc++-v3/ChangeLog
View File

@ -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.

2
libstdc++-v3/include/bits/regex.h
View File

@ -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

2
libstdc++-v3/include/bits/regex_compiler.h
View File

@ -212,7 +212,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
typedef _CharT _StrTransT;
explicit
_RegexTranslator(const _TraitsT& __traits)
_RegexTranslator(const _TraitsT&)
{ }
_CharT

2
libstdc++-v3/include/bits/regex_executor.h
View File

@ -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)

2
libstdc++-v3/include/bits/regex_executor.tcc
View File

@ -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;

4
libstdc++-v3/include/bits/regex_scanner.tcc
View File

@ -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: