From patchwork Wed Jan 10 21:22:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael Levine (BLOOMBERG/ 120 PARK)" X-Patchwork-Id: 187090 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2411:b0:101:2151:f287 with SMTP id m17csp1063595dyi; Wed, 10 Jan 2024 13:26:22 -0800 (PST) X-Google-Smtp-Source: AGHT+IGZaA530/ZXSc4rP2qbtY91lmKVee7J4D6qg8UWnlFIrfCm8gZQHqtG9+DyP1QEz9xyw2UZ X-Received: by 2002:a05:620a:171f:b0:783:3c61:6ff5 with SMTP id az31-20020a05620a171f00b007833c616ff5mr351774qkb.29.1704921982492; Wed, 10 Jan 2024 13:26:22 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1704921982; cv=pass; d=google.com; s=arc-20160816; b=z3vzrmP2IqO7bCP5UBhTOgA5SGeHm845degX7S3spQEAzAyJhcNopG/bELp7jyvRt3 qvJ1ee+BbEyzm3yBCXA4hUB1VYs5o2dt1olObzQMuWq3LIJowpM1MYZBVpshMIYovX2l Babk1AenKYT6K3RoGyttuWXHRUHunrVHR7hcAW9hz7ecgx16tB5lZFHSb+LxYdNVblGf 7K+KlnZs80l6LIroisN/f9Pp3g30afXMgNwQbBtnE7Oyar7Fc57Dvw9CNBaYwoSxEUMq /hi2IqP9mvliaT71Dbk9RhEly5tC7zXvVx4OFJaQI8OX4D1d0zm6DubIrtg+yiCidbey uXZQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:reply-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-id:subject:message-id :mime-version:to:from:date:dkim-signature:arc-filter:dmarc-filter :delivered-to; bh=7JS25QlwMxbyDrm92aVMeo6NOTgkjH7wJKPOYqVm2mo=; fh=hPrbWPhweUx4V0GV9uXJqbyAzg2ABmTz7kczrAQqMmM=; b=MGZbQ7Yd1o9ath1yj5s4Dn66T6qCV/w+c72yO1HTv3fAfuXp2+BhcVJbWIjD3LDrmh eVIuasW75hMfaQsgDlG6s1rzGwizl1NG2BhVJg1iODpohbyRP7L9zqB7W8BpfMlAplW+ l8QHbshD20w0ZSrW5GwSfhaIa7wiU4m5RczPRu46balG5CkeXKTDQBNbwGvn5K4EPDEG nQcKzBzoGMHdjOt48lrdRQJO03Ah8EHXZg/f4UCxcGai4sUdMtAITii9m9PjhZKoeXaE 4kUbjTwzMrwf6LuPemcNPvR9Z7jogkAhimhoWAxksXOOxDEoLgDVMsTNnlSrXkGKmp77 OMYQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=fail header.i=@bloomberg.net header.s=20220517 header.b=WOVgn0WW; arc=pass (i=1); 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=fail (p=NONE sp=NONE dis=NONE) header.from=bloomberg.net Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id h13-20020a05620a400d00b007832eaf5a64si4311444qko.342.2024.01.10.13.26.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jan 2024 13:26:22 -0800 (PST) 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=fail header.i=@bloomberg.net header.s=20220517 header.b=WOVgn0WW; arc=pass (i=1); 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=fail (p=NONE sp=NONE dis=NONE) header.from=bloomberg.net Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id EEBCD386F01F for ; Wed, 10 Jan 2024 21:25:10 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mgnj17.bloomberg.net (mgnj17.bloomberg.net [69.191.244.239]) by sourceware.org (Postfix) with ESMTPS id 9F768386D602 for ; Wed, 10 Jan 2024 21:22:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9F768386D602 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=bloomberg.net Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=bloomberg.net ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 9F768386D602 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=69.191.244.239 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704921780; cv=none; b=GOf5ai4Z5aRL15b9Uzvm4z6dBWgUhn63OOiPdT8JMcIk58X1TVMKzvFhLZDuUkZfbA22jbHUgK2wlHVZS2BOi16TS2aVH62VtDs5pzSNo5OI9Wq1pnko4hGOv9cWknhbTVBdgczB6bsO4qMLRl/TDVHFukzoyB4XeyH1j6AwcMo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704921780; c=relaxed/simple; bh=7JS25QlwMxbyDrm92aVMeo6NOTgkjH7wJKPOYqVm2mo=; h=DKIM-Signature:Date:From:To:MIME-Version:Message-ID:Subject; b=m64dNLvapMGQBWBO2PnUaCNNiM4nLAfvmzFEIzek3nA9MF4ExDFrC5CTK4c2lp4UmlNar+JyXogm6zHrt3IkgGknLUcv+Ygt5Fm2KiElSAoEjI2vlRmolANCcFE/RwHfGjHxwVXPIDi7SAP7+GYGG3H+1ZeGoCdpq1ruv/R0/kI= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bloomberg.net; l=11194; q=dns/txt; s=20220517; t=1704921775; x=1705008175; h=date:from:reply-to:to:mime-version:message-id:subject: content-id; bh=7JS25QlwMxbyDrm92aVMeo6NOTgkjH7wJKPOYqVm2mo=; b=WOVgn0WWfAnHmhyXAkzMfvQSF8i1WztF/y+R11uynu33JBlVvQgqF/KL eSl5wgNsjhmJmkCAQ5Mi37ZM8LsSTg93oAqqNwCYZamjCSsuBl4LvHp/2 SRAoayX0lLbRu92kd1+u3D8qYt8bRobyqkkR8qrK3sLtOp7WbOkuNhgfk WzlOGbfP64k/ldP+jcO8Y9hAQ2PR+alFWk1veFQc5F4yyLRcJm/wnsZXq 1Ic7kBi2ULMdNAeeWh8uqXC99wu7jh49iTSFiM+Z3bBUYuZ3BK4B+W/Ez SOgJMQsNZCRv6KtB+u6yMTDbyRXwwS+/YlxcCe/ejbuK7MZunzRoLB9iw Q==; X-BB-Reception-Complete: 10 Jan 2024 16:22:54 -0500 X-IP-Listener: Outgoing Mail X-IP-MID: 1115595527 Received: from omsg-pw-721.bloomberg.com (HELO omsg-pw-721) ([10.32.193.76]) by mgnj17.bloomberg.net with SMTP; 10 Jan 2024 16:22:54 -0500 X-BLP-INETSVC: version=BLP_APP_S_INETSVC_1.0.1; host=mgnj17:25; conid=478 Date: Wed, 10 Jan 2024 21:22:54 -0000 From: "Michael Levine (BLOOMBERG/ 120 PARK)" To: gcc-patches@gcc.gnu.org MIME-Version: 1.0 Message-ID: <659F0AAE000252DE0C340001@message.bloomberg.net> X-BLP-GUID: 659F0AAE000252DE0C3400010000 Subject: =?utf-8?q?=5BPATCH=5D_libstdc++=3A_std/ranges_-_Remove_a_duplicate_?= =?utf-8?q?define_directive?= Content-ID: X-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, HTML_MESSAGE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, 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.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Michael Levine Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787740272760673577 X-GMAIL-MSGID: 1787740272760673577 From a67cfd07ce27a62f764b381268502acb68b6bad9 Mon Sep 17 00:00:00 2001 From: Michael Levine 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 --- libstdc++-v3/include/std/ranges | 1 - 1 file changed, 1 deletion(-) -- 2.25.1 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 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 --- 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 + + * libstdc++-v3/include/std/ranges: Remove a duplicate define directive + for __glibcxx_want_ranges_iota. + 2024-01-09 Jonathan Wakely * unicode/gen_libstdcxx_unicode_data.py: Print out Gcb_property @@ -2324,8 +2329,8 @@ * update-copyright.py (LibJavaFilter): Remove. -2017-01-17 Gerald Pfeifer - +2017-01-17 Gerald Pfeifer + * 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.