public inbox for libstdc++-cvs@sourceware.org help / color / mirror / Atom feed
From: Jonathan Wakely <redi@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r11-10128] libstdc++: Tweaks to <regex> to avoid warnings Date: Thu, 7 Jul 2022 23:33:05 +0000 (GMT) [thread overview] Message-ID: <20220707233305.64AE23850218@sourceware.org> (raw) https://gcc.gnu.org/g:0b8760ef9771bccc1e31548c00b76993172f0e51 commit r11-10128-g0b8760ef9771bccc1e31548c00b76993172f0e51 Author: Jonathan Wakely <jwakely@redhat.com> Date: Mon Sep 27 20:44:24 2021 +0100 libstdc++: Tweaks to <regex> to avoid warnings Signed-off-by: Jonathan Wakely <jwakely@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. (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<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) {
reply other threads:[~2022-07-07 23:33 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220707233305.64AE23850218@sourceware.org \ --to=redi@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ --cc=libstdc++-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).