From patchwork Thu Sep 1 19:40:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 911 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:ecc5:0:0:0:0:0 with SMTP id s5csp400352wro; Thu, 1 Sep 2022 12:41:16 -0700 (PDT) X-Google-Smtp-Source: AA6agR7gEPDLzDBjQekFuuJ8PiQql5CgJEVdofEo2jgz2AJlZwja2LfZtRWC193m5OLKAP2z5I6o X-Received: by 2002:a05:6402:496:b0:443:a5f5:d3b with SMTP id k22-20020a056402049600b00443a5f50d3bmr31181268edv.331.1662061276521; Thu, 01 Sep 2022 12:41:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662061276; cv=none; d=google.com; s=arc-20160816; b=dQ7FFiOmXfOYxRXAJFE4hOw1xNvHbAytLV2FMofNRaEkbVXYZPRScgshZaECPtW2UC 62rHEljimz1fM72WJiesvefAYqeuhzrUo4p1SfiMNfTyHnDzKcB7HFi5vyB8uNJv69fw Ytw9IMSvuIpjBvwmcQ4xGu/25Ej1y9arTOZhCm17Z/FODwhIdOqZfVSUKcfKT/mXDBx4 VhrEE2oknWSD4gsjkWkiA261zu5VD04bLelDGQ8EgzYwYEvAaywkCt3lZ2aFHrAeYiE5 KPyL9YK+CZjXu8M6Q0/wHLcpzJ3vuu+GAGBdlW8XB4Uy5hfFgksBVes0I0bKk76YXgq0 MZgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:to :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=KsXCsSigPSlQpl98YOhMoEeTbk01r4gEBmiylw9B1Ow=; b=zsTV6JXlfdm1ib1SsrDCuU/fS5hVC0rlZsgOZxMOmVSu3CGIfd3wO0IYdq/kV8AGoE L5kKSLJfPiIB3Dh9SDmVbCoIpDBHWb4bebWiTm5v41SU5FR9xifSEnMxwMdTirLIQwlD GfE6jqJUzM4r/tceuN9X/QBrZwZnBHwcobpiTWDn8qlU2RRen8qEw7OXGFIJCsER+6g0 gmthiGnKmg4UX1mj8u9Da7HHRFe3VB3QKW25/xSFpj7kMUCQaIA0QIVdiA6pfkD+XS2O gyD5laggiy0/ksZ9PZGzy89sRerDftVrRRwYl7K3bzYvz6s87AfoSq6BEq10OHZcHr9F sTsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=xD8PKaPY; 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=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id r22-20020a170906705600b00730b0fef595si48361ejj.857.2022.09.01.12.41.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Sep 2022 12:41:16 -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=@gcc.gnu.org header.s=default header.b=xD8PKaPY; 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=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8A53D3858C2D for ; Thu, 1 Sep 2022 19:41:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8A53D3858C2D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1662061267; bh=KsXCsSigPSlQpl98YOhMoEeTbk01r4gEBmiylw9B1Ow=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=xD8PKaPYyHJR/tR2Ngtj1x7xiRwh3UhTNZUjSoNoOWB9x3r+02rzFKUYh2Z7BZ9Qc //0Y/ynDlxFp55yqlMRQRFkh6ZxqX2HwqrbtZS74Zz9bABjLWy2iz+2G3lSd7graeX 02ofwqsEczX+d42ePit5QTz7ZBAOxIJzbNazEIOU= 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 9131A385841F for ; Thu, 1 Sep 2022 19:40:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9131A385841F Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-567-u9HZsSeSPnOTgKonuuVCwg-1; Thu, 01 Sep 2022 15:40:23 -0400 X-MC-Unique: u9HZsSeSPnOTgKonuuVCwg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BB3321C051AB; Thu, 1 Sep 2022 19:40:22 +0000 (UTC) Received: from localhost (unknown [10.33.36.187]) by smtp.corp.redhat.com (Postfix) with ESMTP id 84B9D2166B26; Thu, 1 Sep 2022 19:40:22 +0000 (UTC) To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Add 'typename' for Clang compatibility Date: Thu, 1 Sep 2022 20:40:21 +0100 Message-Id: <20220901194021.355886-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.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, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jonathan Wakely via Gcc-patches From: Jonathan Wakely Reply-To: Jonathan Wakely Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1742797564772588937?= X-GMAIL-MSGID: =?utf-8?q?1742797564772588937?= Tested x86_64-linux, pushed to trunk. -- >8 -- Clang doesn't yet implement the C++20 change that makes 'typename' optional here. libstdc++-v3/ChangeLog: * include/std/ranges (adjacent_transform_view::_Iterator): Add typename keyword before dependent qualified-id. --- libstdc++-v3/include/std/ranges | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index dad1e4c9f93..2b5cb0531f0 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -5555,7 +5555,7 @@ namespace views::__adaptor using __detail::__unarize; using _Res = invoke_result_t<__unarize<__maybe_const_t<_Const, _Fp>&, _Nm>, range_reference_t<_Base>>; - using _Cat = iterator_traits>::iterator_category; + using _Cat = typename iterator_traits>::iterator_category; if constexpr (!is_lvalue_reference_v<_Res>) return input_iterator_tag{}; else if constexpr (derived_from<_Cat, random_access_iterator_tag>)