[PATCH] libstdc++: std/ranges - Remove a duplicate define directive

["Michael Levine (BLOOMBERG/ 120 PARK)" <mlevine55@bloomberg.net>]

[-- Attachment #1: Type: text/plain, Size: 2319 bytes --]

From a67cfd07ce27a62f764b381268502acb68b6bad9 Mon Sep 17 00:00:00 2001
From: Michael Levine <mlevine55@bloomberg.net>
Date: Wed, 10 Jan 2024 15:48:46 -0500
Subject: [PATCH 1/2] Removed a duplicate define directive for
 __glibcxx_want_ranges_iota

Signed-off-by: Michael Levine <mlevine55@bloomberg.net>
---
 libstdc++-v3/include/std/ranges | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges
index 81a857502e3..ae857f8c7fc 100644
--- a/libstdc++-v3/include/std/ranges
+++ b/libstdc++-v3/include/std/ranges
@@ -59,7 +59,6 @@
 #define __glibcxx_want_ranges_chunk_by
 #define __glibcxx_want_ranges_enumerate
 #define __glibcxx_want_ranges_iota
-#define __glibcxx_want_ranges_iota
 #define __glibcxx_want_ranges_join_with
 #define __glibcxx_want_ranges_repeat
 #define __glibcxx_want_ranges_slide
--
2.25.1


From 204b7ae1e403f86208e781ff2ca68df213d3104b Mon Sep 17 00:00:00 2001
From: Michael Levine <mlevine55@bloomberg.net>
Date: Wed, 10 Jan 2024 16:15:16 -0500
Subject: [PATCH 2/2] Updated the changelog with the change from the previous
 commit

Signed-off-by: Michael Levine <mlevine55@bloomberg.net>
---
 contrib/ChangeLog | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 04bde02b65b..11c9c1178bc 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,8 @@
+2024-01-10  Michael Levine  <mlevine55@bloomberg.net>
+
+       * libstdc++-v3/include/std/ranges: Remove a duplicate define directive
+       for __glibcxx_want_ranges_iota.
+
 2024-01-09  Jonathan Wakely  <jwakely@redhat.com>

        * unicode/gen_libstdcxx_unicode_data.py: Print out Gcb_property
@@ -2324,8 +2329,8 @@

        * update-copyright.py (LibJavaFilter): Remove.

-2017-01-17  Gerald Pfeifer  <gerald@pfeifer.com>
-
+2017-01-17  Gerald Pfeifer  <gerald@pfeifer.com>
+
        * gcc_update: Remove entries related to GCJ and libgcj.
        Complete copyright years and adjust my e-mail address.

@@ -2362,7 +2367,7 @@

        PR other/61439
        * download_prerequisites: Conditionally verify checksums of
-       downloaded pacakges.  Add help text.
+       downloaded pacakges.  Add help text.
        * prerequisites.md5: New file.
        * prerequisites.sha512: New file.

--
2.25.1