From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <arsen@sourceware.org>
Received: by sourceware.org (Postfix, from userid 7917)
	id 1066B3858CDA; Tue, 26 Mar 2024 21:36:02 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1066B3858CDA
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org;
	s=default; t=1711488962;
	bh=20Rs9Z9cbYswMMj0KReoOGN3fiXk7t2wd6MtgPSoPFc=;
	h=From:To:Subject:Date:From;
	b=NYcErLDjUSHmtzQifO3GNlgNt6Y9D4WKBkrmdv7k3Gak/KjEcgjxws0A8LeB1FteO
	 Oxor5oXLllAqYbqQaIQok/BtJAnow2lcYtEuQj5kGT3FWLyeQwuUzGOizTUDxO3mDU
	 L2nSNoBYsnxu6mbWhkU7tdrkOpSLJ+7vWrjv+jCY=
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="utf-8"
From: =?utf-8?q?Arsen_Arsenovi=C4=87?= <arsen@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org
Subject: [gcc r14-9679] libstdc++: fix _V badname in <generator>
X-Act-Checkin: gcc
X-Git-Author: =?utf-8?q?Arsen_Arsenovi=C4=87?= <arsen@aarsen.me>
X-Git-Refname: refs/heads/trunk
X-Git-Oldrev: 5be2313bceea7b482c17ee730efe604b910800bd
X-Git-Newrev: ac5d63a46d78cded2cd4c41a615728b8e46b540f
Message-Id: <20240326213602.1066B3858CDA@sourceware.org>
Date: Tue, 26 Mar 2024 21:36:02 +0000 (GMT)
List-Id: <libstdc++-cvs.sourceware.org>

https://gcc.gnu.org/g:ac5d63a46d78cded2cd4c41a615728b8e46b540f

commit r14-9679-gac5d63a46d78cded2cd4c41a615728b8e46b540f
Author: Arsen Arsenović <arsen@aarsen.me>
Date:   Sat Mar 23 16:14:33 2024 +0100

    libstdc++: fix _V badname in <generator>
    
    libstdc++-v3/ChangeLog:
    
            * include/std/generator: Fix _V badname.

Diff:
---
 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/std/generator
index 87983ee5e7c..2d1dcced1e5 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<typename _Ref, typename _V = void, typename _Alloc = void>
+  template<typename _Ref, typename _Val = void, typename _Alloc = void>
     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<typename _Ref, typename _Val>
     using _Reference_t = __conditional_t<is_void_v<_Val>,
 					 _Ref&&, _Ref>;
@@ -642,14 +642,16 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
   } // namespace __gen
   /// @endcond
 
-  template<typename _Ref, typename _V, typename _Alloc>
+  template<typename _Ref, typename _Val, typename _Alloc>
     class generator
-      : public ranges::view_interface<generator<_Ref, _V, _Alloc>>
+      : public ranges::view_interface<generator<_Ref, _Val, _Alloc>>
     {
-      using _Value = __conditional_t<is_void_v<_V>, remove_cvref_t<_Ref>, _V>;
+      using _Value = __conditional_t<is_void_v<_Val>,
+				     remove_cvref_t<_Ref>,
+				     _Val>;
       static_assert(__gen::_Cv_unqualified_object<_Value>,
 		    "Generator value must be a cv-unqualified object type");
-      using _Reference = __gen::_Reference_t<_Ref, _V>;
+      using _Reference = __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 = false;
     };
 
-  template<class _Ref, class _V, class _Alloc>
-    struct generator<_Ref, _V, _Alloc>::_Iterator
+  template<class _Ref, class _Val, class _Alloc>
+    struct generator<_Ref, _Val, _Alloc>::_Iterator
     {
       using value_type = _Value;
       using difference_type = ptrdiff_t;