From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id 5DF503858038 for ; Tue, 28 Sep 2021 19:40:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5DF503858038 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-148-QrD9bojiMFK0_Duku2EoHA-1; Tue, 28 Sep 2021 15:40:20 -0400 X-MC-Unique: QrD9bojiMFK0_Duku2EoHA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 96A4B802CBA; Tue, 28 Sep 2021 19:40:19 +0000 (UTC) Received: from localhost (unknown [10.33.36.241]) by smtp.corp.redhat.com (Postfix) with ESMTP id 487685C1D0; Tue, 28 Sep 2021 19:40:19 +0000 (UTC) Date: Tue, 28 Sep 2021 20:40:18 +0100 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Tweaks to to avoid warnings Message-ID: MIME-Version: 1.0 X-Clacks-Overhead: GNU Terry Pratchett X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="xVykTpTqkDgFDM9q" Content-Disposition: inline X-Spam-Status: No, score=-13.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libstdc++@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++ mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Sep 2021 19:40:23 -0000 --xVykTpTqkDgFDM9q Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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. Tested x86_64-linux. Committed to trunk. --xVykTpTqkDgFDM9q Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch.txt" commit b5f276b8c76d892f7fed229153cfbadc13f4696e Author: Jonathan Wakely Date: Mon Sep 27 20:44:24 2021 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. 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 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) { --xVykTpTqkDgFDM9q--