From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 64AE23850218; Thu, 7 Jul 2022 23:33:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 64AE23850218 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r11-10128] libstdc++: Tweaks to to avoid warnings X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: e925af11d9c1c9a0dfd74a11f5a331be595d7d3c X-Git-Newrev: 0b8760ef9771bccc1e31548c00b76993172f0e51 Message-Id: <20220707233305.64AE23850218@sourceware.org> Date: Thu, 7 Jul 2022 23:33:05 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jul 2022 23:33:05 -0000 https://gcc.gnu.org/g:0b8760ef9771bccc1e31548c00b76993172f0e51 commit r11-10128-g0b8760ef9771bccc1e31548c00b76993172f0e51 Author: Jonathan Wakely Date: Mon Sep 27 20:44:24 2021 +0100 libstdc++: Tweaks to to avoid warnings Signed-off-by: Jonathan Wakely libstdc++-v3/ChangeLog: * include/bits/regex_compiler.tcc: Add line break in empty while statement. * include/bits/regex_executor.tcc: Avoid unused parameter warning. (cherry picked from commit b5f276b8c76d892f7fed229153cfbadc13f4696e) Diff: --- libstdc++-v3/include/bits/regex_compiler.tcc | 6 ++++-- libstdc++-v3/include/bits/regex_executor.tcc | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/include/bits/regex_compiler.tcc b/libstdc++-v3/include/bits/regex_compiler.tcc index e4f73971bbb..9550d06aea7 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 405d1c4d0d1..88bbbf42f78 100644 --- a/libstdc++-v3/include/bits/regex_executor.tcc +++ b/libstdc++-v3/include/bits/regex_executor.tcc @@ -423,7 +423,7 @@ namespace __detail template 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) {