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 790313857C51 for ; Wed, 20 Oct 2021 16:59:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 790313857C51 Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-460-vWv_YZQXPNqwdsnP1reBNg-1; Wed, 20 Oct 2021 12:59:48 -0400 X-MC-Unique: vWv_YZQXPNqwdsnP1reBNg-1 Received: by mail-qk1-f200.google.com with SMTP id h8-20020a05620a284800b0045ec745583cso2628515qkp.6 for ; Wed, 20 Oct 2021 09:59:46 -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=lqmlmDmrs/FU67ZjbIQwijcfRgCNbeAaUkQHnHw+1FE=; b=pUcUprpVBh0DHJPQKO63jwXbwl9O7YnzmRDVy8GHuy/m6Zl1Usez54I/v9mL+Rb1+Y 43XbbhqizXEiCxAC5ra1Hyf7f2D56CUK0eLnvKLbCidpiHTU3mEaZJHjfb9iuRla764L 0jB04G5lBaBwbR5/NHKzD/aZPKlOuUN44RU3wBnNsHg6cVHFzodmKPl3Whdnkkg+2X8s FJGt3AWyZ5O4LGMMOlSVh96daQJXwuzhv/6J7NIrPtZHASJHezPmTo07yDY8sGpkBp// 6tYSydTlFboY4x0JPnQaFBOeJ24H3FcFBTDBhINsddOv9zjQ69zzYtopI0xVvSrshMCJ BHzw== X-Gm-Message-State: AOAM531tGD62LnHfXRZ3mZYAgtMgQ2hk2NP9DJVbZlSV549VlbZl2nik uz/oZA+3lKfz53z81IJPYKYHx7l9Zrk3nltaROCJ+yyKI8hjDEfUsyeZ82clUqmjXR6BIKzIi0A 34kWpmcIcDE95zJ0UAvR/8fZ6FlJI+GaM1ZaQerIEGSf6Yc28lbIzi98YQFu0fq8VWlU= X-Received: by 2002:a37:4050:: with SMTP id n77mr184265qka.267.1634749186181; Wed, 20 Oct 2021 09:59:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx/33Y8G3IxRWwyH2I1iTt3VIwEVzTilc2mx9PbPZCGqghUclBzE+ijy+jP4XvDbB0zrrZG2Q== X-Received: by 2002:a37:4050:: with SMTP id n77mr184243qka.267.1634749185898; Wed, 20 Oct 2021 09:59:45 -0700 (PDT) Received: from localhost.localdomain (ool-457d493a.dyn.optonline.net. [69.125.73.58]) by smtp.gmail.com with ESMTPSA id r186sm1206802qkf.128.2021.10.20.09.59.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Oct 2021 09:59:45 -0700 (PDT) From: Patrick Palka To: gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org, Patrick Palka Subject: [PATCH] libstdc++: Implement LWG 3535 changes to ranges::join_view Date: Wed, 20 Oct 2021 12:59:42 -0400 Message-Id: <20211020165942.1827062-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=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-List-Received-Date: Wed, 20 Oct 2021 16:59:50 -0000 Tested on x86_64-pc-linux-gnu, does this look OK for trunk, and branches after a while? libstdc++-v3/ChangeLog: * include/std/ranges (join_view::__iter_cat::_S_iter_cat): Adjust criteria for returning bidirectional_iterator_tag as per LWG3535. (join_view::_Iterator::_S_iter_concept): Likewise. --- libstdc++-v3/include/std/ranges | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index 273699aa790..c1519c7dbd5 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -2523,7 +2523,8 @@ namespace views::__adaptor using _OuterCat = typename iterator_traits<_Outer_iter>::iterator_category; using _InnerCat = typename iterator_traits<_Inner_iter>::iterator_category; if constexpr (derived_from<_OuterCat, bidirectional_iterator_tag> - && derived_from<_InnerCat, bidirectional_iterator_tag>) + && derived_from<_InnerCat, bidirectional_iterator_tag> + && common_range>>) return bidirectional_iterator_tag{}; else if constexpr (derived_from<_OuterCat, forward_iterator_tag> && derived_from<_InnerCat, forward_iterator_tag>) @@ -2575,7 +2576,8 @@ namespace views::__adaptor { if constexpr (_S_ref_is_glvalue && bidirectional_range<_Base> - && bidirectional_range>) + && bidirectional_range> + && common_range>) return bidirectional_iterator_tag{}; else if constexpr (_S_ref_is_glvalue && forward_range<_Base> -- 2.33.1.711.g9d530dc002