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 89649386000B for ; Tue, 26 Mar 2024 11:00:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 89649386000B 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 89649386000B Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711450845; cv=none; b=n5czBwcanSXjOX08pug/c0ZPJSU2Pcqb6cqHJP4Tagmisg4Ln2mszwbo2UP5/oS4injgGuDBpenHQr682REQayqe1yJo4J977E7mLAm5bBvHAxwTOddJ2HJ5LsZTVhVgrG+J+uHIgmAJNY7nJR/5qiekg/l1rEFzyzf6kdBIliw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711450845; c=relaxed/simple; bh=k6pdg/aPPzit4bW/ylhoIxPy0EwHmi7Wdxpd9/00tX8=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=LKH/j4LSqTn5u0D8U4GHm1jl8+WF2MEhJoZXjGCMhlxinT3nGhnFf0fAFwVkAicjUWLP2yMJC+7nChG3DeswW5sMKBk3/4WBpYxYuRPXC4rawNSZ2eGdYVWGh4QIde0x594R9NqoJxpz8LCtLHY4TRoL+nsdpI/ADnKNfYjT880= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711450837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kNXmIT6c4fpmJ3jCJkDgfU3CK1TonuwotYGOwh3Ab9I=; b=Oz5lItIGFoKMPC+FpyRrexyQD5HNgLzm6buGHpyX6N6gOE7AzqexnQ9RrFQUHkm2lSxBUJ UcP+pmXuR84rk+AV1SF5vUVcaqtF7doui6F9Psnb8Zk4wvhLoZ/WBFHH0Jc+pGHv7gBQBc WZoLaXEM27mqjz899Vy9p5sPRAtibtY= Received: from mail-yb1-f200.google.com (mail-yb1-f200.google.com [209.85.219.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-130-VxJKz-HbMOiCX0BhWcDDUw-1; Tue, 26 Mar 2024 07:00:33 -0400 X-MC-Unique: VxJKz-HbMOiCX0BhWcDDUw-1 Received: by mail-yb1-f200.google.com with SMTP id 3f1490d57ef6-dc74ac7d015so6391960276.0 for ; Tue, 26 Mar 2024 04:00:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711450833; x=1712055633; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kNXmIT6c4fpmJ3jCJkDgfU3CK1TonuwotYGOwh3Ab9I=; b=DLXN1wZhvGg4OoaQcM6bG4FnBBpIxQsEJMxnozCGxAC9JKRRDrzn8kXMFbFEdccu1D YyxNxgTfVN2rL1vEMcTreMYf3aEp/UjYaSRhzlg6Bo8zdVHjBd2t+wYei65qbt95arhx W4V6o9MGGB4qD/mbbWdsBgkJOqqoy/GvpaXaKMvLKwgIKrU5htW4eGSNHrf2H365OKuK lyNSrqPVUelCEgQRbakZw0vMaWWv3pI/37UNs2JbsUOzg1jLpYW/NmjHaBN0z+Q7oL9A tQ/7FdeASqMGzG51jlGsfSkBDI5evr7kfkUsI1Zh4TOx0dW0YJdnlUw5c+p1gEbQa9An PB/g== X-Forwarded-Encrypted: i=1; AJvYcCXaTcDlMVT7Dw583O30VZMb94ipzjKZ+YJJzEPNTiz8To1UAJbO+T4UPPyST8mDnkxlnODU3/5D/xRXZ2d2gU7RuoBmsB0= X-Gm-Message-State: AOJu0YzqcWFz9oQ7sa1Wer8+p4z1RfBRGrnasuc7FN1SHLUzUbZN3V1O cz3K+1a27lPivL8J/oXCsetwPWBGKOSVopKDVhPIv85VWqlUhgJZbZYyMcAWkmUn5dzCky6v+ja T5LyqleTS3/QgMgUAFMpXmNWxm5gBZ6XzUhvsPZSlJ9MLowtHEECxPDLz4R9rWSxI1M1vfZOS45 NX9uD4mV+aojEE8wj21saG6YVgo2A= X-Received: by 2002:a5b:786:0:b0:dcc:375:2257 with SMTP id b6-20020a5b0786000000b00dcc03752257mr2267613ybq.0.1711450833406; Tue, 26 Mar 2024 04:00:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGVbPL/bOxa02NEmhRKpknrFoaVPcOGmmdXEI6rvftnPSloYyqfZNmwdVVCyKAa2k+OEyzazD3uEqf2o8IK76Q= X-Received: by 2002:a5b:786:0:b0:dcc:375:2257 with SMTP id b6-20020a5b0786000000b00dcc03752257mr2267521ybq.0.1711450831698; Tue, 26 Mar 2024 04:00:31 -0700 (PDT) MIME-Version: 1.0 References: <20240323154205.1907790-1-arsen@aarsen.me> <20240323154205.1907790-2-arsen@aarsen.me> In-Reply-To: <20240323154205.1907790-2-arsen@aarsen.me> From: Jonathan Wakely Date: Tue, 26 Mar 2024 11:00:16 +0000 Message-ID: Subject: Re: [PATCH 1/2] libstdc++: fix _V badname in To: =?UTF-8?Q?Arsen_Arsenovi=C4=87?= Cc: gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-12.2 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 List-Id: On Sat, 23 Mar 2024 at 15:47, Arsen Arsenovi=C4=87 wrote: > > libstdc++-v3/ChangeLog: > > * include/std/generator: Fix _V badname. OK for trunk, thanks. > --- > libstdc++-v3/include/std/generator | 18 ++++++++++-------- > 1 file changed, 10 insertions(+), 8 deletions(-) > > diff --git a/libstdc++-v3/include/std/generator b/libstdc++-v3/include/st= d/generator > index 87983ee5e7c6..2d1dcced1e57 100644 > --- a/libstdc++-v3/include/std/generator > +++ b/libstdc++-v3/include/std/generator > @@ -76,14 +76,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > * @headerfile generator > * @since C++23 > */ > - template > + template > class generator; > > /// @cond undocumented > namespace __gen > { > /// _Reference type for a generator whose reference (first argument)= and > - /// value (second argument) types are _Ref and _V. > + /// value (second argument) types are _Ref and _Val. > template > using _Reference_t =3D __conditional_t, > _Ref&&, _Ref>; > @@ -642,14 +642,16 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > } // namespace __gen > /// @endcond > > - template > + template > class generator > - : public ranges::view_interface> > + : public ranges::view_interface> > { > - using _Value =3D __conditional_t, remove_cvref_t<_Re= f>, _V>; > + using _Value =3D __conditional_t, > + remove_cvref_t<_Ref>, > + _Val>; > static_assert(__gen::_Cv_unqualified_object<_Value>, > "Generator value must be a cv-unqualified object type= "); > - using _Reference =3D __gen::_Reference_t<_Ref, _V>; > + using _Reference =3D __gen::_Reference_t<_Ref, _Val>; > static_assert(is_reference_v<_Reference> > || (__gen::_Cv_unqualified_object<_Reference> > && copy_constructible<_Reference>), > @@ -737,8 +739,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > bool _M_began =3D false; > }; > > - template > - struct generator<_Ref, _V, _Alloc>::_Iterator > + template > + struct generator<_Ref, _Val, _Alloc>::_Iterator > { > using value_type =3D _Value; > using difference_type =3D ptrdiff_t; > -- > 2.44.0 >