Signed-off-by: Jonathan Wakely <jwak...@redhat.com>
libstdc++-v3/ChangeLog:
* include/bits/regex_compiler.tcc: Add line break in empty while
statement.
* include/bits/regex_executor.tcc: Avoid unused parameter
warning.
Tested x86_64-linux. Committed to trunk.
commit b5f276b8c76d892f7fed229153cfbadc13f4696e
Author: Jonathan Wakely <jwak...@redhat.com>
Date: Mon Sep 27 20:44:24 2021
libstdc++: Tweaks to <regex> to avoid warnings
Signed-off-by: Jonathan Wakely <jwak...@redhat.com>
libstdc++-v3/ChangeLog:
* include/bits/regex_compiler.tcc: Add line break in empty while
statement.
* include/bits/regex_executor.tcc: Avoid unused parameter
warning.
diff --git a/libstdc++-v3/include/bits/regex_compiler.tcc
b/libstdc++-v3/include/bits/regex_compiler.tcc
index 440669debe0..9f04c1be686 100644
--- a/libstdc++-v3/include/bits/regex_compiler.tcc
+++ b/libstdc++-v3/include/bits/regex_compiler.tcc
@@ -140,7 +140,8 @@ namespace __detail
return true;
if (this->_M_atom())
{
- while (this->_M_quantifier());
+ while (this->_M_quantifier())
+ ;
return true;
}
return false;
@@ -440,7 +441,8 @@ namespace __detail
__last_char.second = '-';
}
}
- while (_M_expression_term(__last_char, __matcher));
+ while (_M_expression_term(__last_char, __matcher))
+ ;
if (__last_char.first)
__matcher._M_add_char(__last_char.second);
__matcher._M_ready();
diff --git a/libstdc++-v3/include/bits/regex_executor.tcc
b/libstdc++-v3/include/bits/regex_executor.tcc
index 3cefeda48a3..2577265c33a 100644
--- a/libstdc++-v3/include/bits/regex_executor.tcc
+++ b/libstdc++-v3/include/bits/regex_executor.tcc
@@ -423,7 +423,7 @@ namespace __detail
template<typename _BiIter, typename _Alloc, typename _TraitsT,
bool __dfs_mode>
void _Executor<_BiIter, _Alloc, _TraitsT, __dfs_mode>::
- _M_handle_accept(_Match_mode __match_mode, _StateIdT __i)
+ _M_handle_accept(_Match_mode __match_mode, _StateIdT)
{
if (__dfs_mode)
{
