From patchwork Sat Oct 21 10:54:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 156443 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp259576vqx; Sat, 21 Oct 2023 05:17:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHUALu9cTfubcYYQnzuR0kjMtHxcWIB2aqeVwXkKMuGIFUMh5BxZ2W8LhW1Mt0mIOwY6gjn X-Received: by 2002:ad4:5b85:0:b0:66d:6458:d9f8 with SMTP id 5-20020ad45b85000000b0066d6458d9f8mr5621198qvp.54.1697890629165; Sat, 21 Oct 2023 05:17:09 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1697890629; cv=pass; d=google.com; s=arc-20160816; b=bmisFnZ+FhuEv44UEoAT1zGstsgYbKLQs3nKe7dSOUGZPFZMCCb+nIbKFMpwliUCPh vsjdf5NDjB+e3N26AEI0F93T+GuuHuHv7x8ii7nK7dhC0wICTQjD35LKVa612dbehNsk KCnijd5jtfoOGni9Fyo87tFaYX/JNt7hGt4oxdyTDJtqBLoJmQDpp1rlgrFAY88aaxgT OcIN+tWc6PXRQPLQbEdJpUCvCWGFoD2R9uvP0kx9bdD/5eQhluvOs6Sq53Rm4uOP5JRb 6sIUY2BtAVC7mNHR1Hm3c9PleWrbI5zHYaz3B7374PrgBm9Rl2GnPNiGW5E1hKP5xfYc 4YEQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:to:from:dkim-signature :arc-filter:dmarc-filter:delivered-to; bh=IS9De/D4VHoHkM4krawfj7OW0TJx0xiYy8fiq+CzbRk=; fh=sJ+2/4g29YdyXkoRrFZSpsL2zxijepB7X/1rB0LDDh8=; b=XyVM5a5pqz3TZVqeVEPPHTCxT15XmjAHIYkvyqDoEObq+bndoW8u3qAXzPVuAIZ+EG EKulw8JdOGZg23p9dJqkuo2ku7ljTVK+RiYwA61MP35fHTT0ECa6+9BUuVOBxDG8NgSo KU7sIEIOJOminPAheV5OST9VbVuMq+vaeEtYIBZeGLfiGL2b7KuRO9fQRNvC0RSWI+IQ mhO2Cg5QZEGYhDDIrxczMErz+Jsu1ZrVuHWIlo55iIEqHDwHxLH20nWV8q62lqKFie2l PdLhXikXv+MlWtJdDT3aryPpfhx8Anvsi475bQwvq30KhKfLej6Q8uYjCvOgguv+uFyz gyNA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Vqiw27O8; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id qf11-20020a0562144b8b00b0065af252f947si2839258qvb.273.2023.10.21.05.17.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Oct 2023 05:17:09 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Vqiw27O8; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2F6AC385700D for ; Sat, 21 Oct 2023 11:09:39 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 7FEF23858D39 for ; Sat, 21 Oct 2023 11:09:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7FEF23858D39 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 7FEF23858D39 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1697886556; cv=none; b=h/9AkSpLBKO8aI6zZ34ZAa24IWSLCKTpObIf6zN01b9yw3lPFZ0xQo9BvR8UgVZbaMWi3JZx5RcTY0meePaHPp/W09qCOnqBcvH4YPRUFz9fhfKPAxx8aqa3BgceCOlLmxNEa+55iXvDP/Kp3R/tWzV0TFpTgo421o1Yk9m6Lh4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1697886556; c=relaxed/simple; bh=PcRpsyhFhdfEGPGnfvzStZXjbcGZEbPbjMGnxEbd3zE=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=Crbqka8uDg9OgpAfQ3yuxIIa0P0Si7ceA0NNUNXzyaxQV1Urc8HfIsj12x2cEPOuDlUutlJShdSe6WF+qoMkWCwBzExwglS7qPq39lnMvCLubm5tK3ZGyvbjBdEoTdxI2Y1Y7bUw/eOvn6XxuS9hbuNPW7wGkpsTWi6uAXTHrHM= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697886555; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IS9De/D4VHoHkM4krawfj7OW0TJx0xiYy8fiq+CzbRk=; b=Vqiw27O8sgfdBrMj6hH8cDjHIQFZJJEFz0NH5y8iWbYJsFXUy01ypjc+XaIIVvKw4KOcLQ jo6dymK9P0uy6UBj7+s/I6y0lcUT9bjLOdLOTpj9d/UosJEIZUjZpdbLNJUShxC5J/dull fumYtdjU91nb1K6a4zAR2gse+tMVjnk= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-77-umw-b7HePAWaLDJrQEGhMg-1; Sat, 21 Oct 2023 07:09:11 -0400 X-MC-Unique: umw-b7HePAWaLDJrQEGhMg-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 74AC287A9F3; Sat, 21 Oct 2023 11:09:11 +0000 (UTC) Received: from localhost (unknown [10.42.28.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id 40741C15BB8; Sat, 21 Oct 2023 11:09:11 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Fix formatting of filesystem directory iterators Date: Sat, 21 Oct 2023 11:54:37 +0100 Message-ID: <20231021110910.155119-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.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_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780367364637872468 X-GMAIL-MSGID: 1780367364637872468 Tested x86_64-linux. Pushed to trunk. -- >8 -- Fix indentation. libstdc++-v3/ChangeLog: * include/bits/fs_dir.h (operator==(default_sentinel_t)): Fix indentation. --- libstdc++-v3/include/bits/fs_dir.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libstdc++-v3/include/bits/fs_dir.h b/libstdc++-v3/include/bits/fs_dir.h index 9dd0f896e46..3b0a493dc3f 100644 --- a/libstdc++-v3/include/bits/fs_dir.h +++ b/libstdc++-v3/include/bits/fs_dir.h @@ -449,10 +449,10 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 } #if __cplusplus >= 202002L - // _GLIBCXX_RESOLVE_LIB_DEFECTS - // 3719. Directory iterators should be usable with default sentinel - bool operator==(default_sentinel_t) const noexcept - { return !_M_dir; } + // _GLIBCXX_RESOLVE_LIB_DEFECTS + // 3719. Directory iterators should be usable with default sentinel + bool operator==(default_sentinel_t) const noexcept + { return !_M_dir; } #endif #if __cpp_impl_three_way_comparison < 201907L @@ -565,10 +565,10 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 } #if __cplusplus >= 202002L - // _GLIBCXX_RESOLVE_LIB_DEFECTS - // 3719. Directory iterators should be usable with default sentinel - bool operator==(default_sentinel_t) const noexcept - { return !_M_dirs; } + // _GLIBCXX_RESOLVE_LIB_DEFECTS + // 3719. Directory iterators should be usable with default sentinel + bool operator==(default_sentinel_t) const noexcept + { return !_M_dirs; } #endif #if __cpp_impl_three_way_comparison < 201907L