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 ESMTPS id 2A6913858030 for ; Wed, 20 Oct 2021 17:00:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 2A6913858030 Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-286-KngVLCUzOU2mm45bpxHYBA-1; Wed, 20 Oct 2021 13:00:29 -0400 X-MC-Unique: KngVLCUzOU2mm45bpxHYBA-1 Received: by mail-qt1-f199.google.com with SMTP id c19-20020ac81e93000000b002a71180fd3dso2579444qtm.1 for ; Wed, 20 Oct 2021 10:00:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=peM8yCe/qdMV7RzdD77k5P6TpPHNaMogdlFmW8QiG7Q=; b=h4En6ef9W1wv0kmlfZToFFZxRSntWqjxkK+uer+HcOulbl2OllFFNofKgYMDFqGAbO s2jMbPaZ4jZBtO9DZ/uwPIwiPRksnLXlWB9wcmqbAFlHmD1WI3zMAt2q2ZGfzXLY9VQV TzdeJkLZi+SX3uCP+TL56TjkS2z3QsVSLJ92DTJhzl36ANEekp1PG6juoYy22cMY6iWK h307Awn3N6iHFCyUvrECCJeJwjymlofax/8PtEaftQRvgOFopR5HQSlShEDjrUEPIp85 Joww4bwRKCkYWJFjcnwFv3tLqvutG3BV12ushBIjK7/VdRyO5CRfr5y+LGRtCr7SOLxL lfdA== X-Gm-Message-State: AOAM532+Ruq/+74c+vW9Yimi6PydNizchTqtLnILe4SvkX0s5ktz2m06 bXJYkNSSU7MkZyjhnAQLrPkRXf1j2rdpe0oypSJHxO+U0GZOXnNCkMDZR7AnzVkg4H2AtiYpPzZ rcqXM+T2HShZ/4+I= X-Received: by 2002:a37:9606:: with SMTP id y6mr216136qkd.13.1634749229181; Wed, 20 Oct 2021 10:00:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxbRl7LZj27OzZaWG/SOXIvxK8GnDOTQXyIpZrTJYGbFWqztA3Nw3TGZpQ+i9rpRrCEKoiCaw== X-Received: by 2002:a37:9606:: with SMTP id y6mr216118qkd.13.1634749229030; Wed, 20 Oct 2021 10:00:29 -0700 (PDT) Received: from localhost.localdomain (ool-457d493a.dyn.optonline.net. [69.125.73.58]) by smtp.gmail.com with ESMTPSA id z6sm1298477qtj.90.2021.10.20.10.00.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Oct 2021 10:00:28 -0700 (PDT) From: Patrick Palka To: gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org, Patrick Palka Subject: [PATCH] libstdc++: Implement LWG 3595 changes to common_iterator Date: Wed, 20 Oct 2021 13:00:26 -0400 Message-Id: <20211020170026.1827253-1-ppalka@redhat.com> X-Mailer: git-send-email 2.33.1.711.g9d530dc002 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" X-Spam-Status: No, score=-15.7 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: Wed, 20 Oct 2021 17:00:33 -0000 Tested on x86_64-pc-linux-gnu, does this look OK for trunk and branches? libstdc++-v3/ChangeLog: * include/bits/stl_iterator.h (common_iterator::__arrow_proxy): Make fully constexpr. (common_iterator::__postfix_proxy): Likewise. --- libstdc++-v3/include/bits/stl_iterator.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/include/bits/stl_iterator.h b/libstdc++-v3/include/bits/stl_iterator.h index 8afd6756613..da3c8d5bd97 100644 --- a/libstdc++-v3/include/bits/stl_iterator.h +++ b/libstdc++-v3/include/bits/stl_iterator.h @@ -1821,13 +1821,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { iter_value_t<_It> _M_keep; - __arrow_proxy(iter_reference_t<_It>&& __x) + constexpr __arrow_proxy(iter_reference_t<_It>&& __x) : _M_keep(std::move(__x)) { } friend class common_iterator; public: - const iter_value_t<_It>* + constexpr const iter_value_t<_It>* operator->() const noexcept { return std::__addressof(_M_keep); } }; @@ -1836,13 +1836,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { iter_value_t<_It> _M_keep; - __postfix_proxy(iter_reference_t<_It>&& __x) + constexpr __postfix_proxy(iter_reference_t<_It>&& __x) : _M_keep(std::forward>(__x)) { } friend class common_iterator; public: - const iter_value_t<_It>& + constexpr const iter_value_t<_It>& operator*() const noexcept { return _M_keep; } }; -- 2.33.1.711.g9d530dc002