From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 7F26D3857707; Fri, 23 Jun 2023 16:12:37 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7F26D3857707 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1687536757; bh=r+20oj6OkOvJNLxc2Qgw/7w29DBd1KR53WSAtBtkXew=; h=From:To:Subject:Date:From; b=OsjhXt21+akn45lWbLJL14e5O4jPZClkBHqwyE7pJvPAzpb0fMMEdYn4SMjRXZ0mF mhcPVC+3GsSNk4PdHEea8r4xRAlkJr1zq7ulu+NzblY66t4AWgwolGTDeG3MQPPR+N 2RMCpAz6KVsGxRFsndG/HK6g5W9idy7A2jCUsfp4= 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 r10-11463] libstdc++: Tweaks to to avoid warnings X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-10 X-Git-Oldrev: 364cb498c472790e14561f7672dc5ab4a9222287 X-Git-Newrev: 884751cc4f24ae92f550a4733632e9c54e7182d8 Message-Id: <20230623161237.7F26D3857707@sourceware.org> Date: Fri, 23 Jun 2023 16:12:37 +0000 (GMT) List-Id: https://gcc.gnu.org/g:884751cc4f24ae92f550a4733632e9c54e7182d8 commit r10-11463-g884751cc4f24ae92f550a4733632e9c54e7182d8 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 d29a0537283..3667c860690 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 5c8f8492de1..352f24bf306 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) {