From patchwork Wed Oct 20 17:00:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 46445 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6F4EB3858437 for ; Wed, 20 Oct 2021 17:05:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6F4EB3858437 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1634749524; bh=peM8yCe/qdMV7RzdD77k5P6TpPHNaMogdlFmW8QiG7Q=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=YcGXqSAHjgzBFQuNEPcMhQZQ6XuGR7JeCvWsRmEo5iqHsQYHfQY/Ov/j5iuo106Aa VeUbVaVj7oDRc4NpoBkvwJ72H9VZql+EY9VQ4YX+wpXKLOWti+mgJoP2zLjwJ4leT1 MnNfmlGo8txBhZMq/5BeAT9GnkQzaJjdZdTG1ZAA= 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.133.124]) by sourceware.org (Postfix) with ESMTPS id 586993857C67 for ; Wed, 20 Oct 2021 17:00:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 586993857C67 Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-544-2LBb4x41OrmHjqJKinmmww-1; Wed, 20 Oct 2021 13:00:30 -0400 X-MC-Unique: 2LBb4x41OrmHjqJKinmmww-1 Received: by mail-qv1-f70.google.com with SMTP id gs5-20020a056214226500b00382f5609124so3312629qvb.8 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=sYJUc/kpLfnr4oLDzXrK7ihbg1AS2JMyRdVdKw3H3D2F3K5RDoN33EmDZX0YWpOove RZitF3Bqx7ASFAIH/onF+dxJ0Z9Efl5u9Ge/L4uzEPPHDYvd/JpNyyieQbqybp0A+k7+ voUfhffp5YFJPYqESQzxL56xmmVX6aZ2bR22WSWGsy7dpUJv39GjIOUL2vWgX2dNxVSw wGfElten4jHQxWfcqcDUTRK1W4pYe4miMWOhhPM3iU6I0QdXVCIubw6+DVASDUiiUSU8 ZBcK7fKv3z5gVCAC06wpIK3Un4H6Za7HDc9NnA1780vicXNFr3YdROR5taIC4GbrXTpC xuDQ== X-Gm-Message-State: AOAM533ax+q9UAQVKaqURwZdNyjHQ2ljO+46VV+IPZCwp2LCxZWVSOWe zMGKHOfcumkAuWfuC7aFkNDJsHLAHvWr/Kj/iZ43xZWX5RFVCL7KuovdaEyJqfa89sqx3G/M7Tc OhwFrtVufoGulcbXC5cGbS4zkYfY9673rd+8i+IrER/dxVXx7GDlq3giHaorchR70ERA= X-Received: by 2002:a37:9606:: with SMTP id y6mr216144qkd.13.1634749229242; 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) To: gcc-patches@gcc.gnu.org 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 X-Spam-Status: No, score=-15.1 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=unavailable autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Patrick Palka via Gcc-patches From: Patrick Palka Reply-To: Patrick Palka Cc: libstdc++@gcc.gnu.org Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" 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; } };