From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <jwakely@redhat.com>
Received: from us-smtp-delivery-124.mimecast.com
 (us-smtp-delivery-124.mimecast.com [216.205.24.124])
 by sourceware.org (Postfix) with ESMTP id 195573950C68
 for <libstdc++@gcc.gnu.org>; Tue, 13 Jul 2021 11:11:05 +0000 (GMT)
DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 195573950C68
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
 [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id
 us-mta-391-3eyx4QyCPHGdO0w71QTvsg-1; Tue, 13 Jul 2021 07:11:02 -0400
X-MC-Unique: 3eyx4QyCPHGdO0w71QTvsg-1
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com
 [10.5.11.13])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B313C10B7462;
 Tue, 13 Jul 2021 11:11:01 +0000 (UTC)
Received: from localhost (unknown [10.33.37.12])
 by smtp.corp.redhat.com (Postfix) with ESMTP id 5D7D160918;
 Tue, 13 Jul 2021 11:11:01 +0000 (UTC)
Date: Tue, 13 Jul 2021 12:11:00 +0100
From: Jonathan Wakely <jwakely@redhat.com>
To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org
Subject: [committed] libstdc++: Remove duplicate #include in <string_view>
Message-ID: <YO10xLj4M4qZCKoj@redhat.com>
MIME-Version: 1.0
X-Clacks-Overhead: GNU Terry Pratchett
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Type: multipart/mixed; boundary="GU9ZSdIpubxokFjY"
Content-Disposition: inline
X-Spam-Status: No, score=-14.1 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, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,
 SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4
X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on
 server2.sourceware.org
X-BeenThere: libstdc++@gcc.gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Libstdc++ mailing list <libstdc++.gcc.gnu.org>
List-Unsubscribe: <https://gcc.gnu.org/mailman/options/libstdc++>,
 <mailto:libstdc++-request@gcc.gnu.org?subject=unsubscribe>
List-Archive: <https://gcc.gnu.org/pipermail/libstdc++/>
List-Post: <mailto:libstdc++@gcc.gnu.org>
List-Help: <mailto:libstdc++-request@gcc.gnu.org?subject=help>
List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/libstdc++>,
 <mailto:libstdc++-request@gcc.gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Jul 2021 11:11:06 -0000

--GU9ZSdIpubxokFjY
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

When I added the new C++23 constructor I added a conditional include of
<bits/ranges_base.h>, which was already being included unconditionally.
This removes the unconditional include but changes the condition for the
other one, so it's used for C++20 as well.

Signed-off-by: Jonathan Wakely <jwakely@redhat.com>

libstdc++-v3/ChangeLog:

	* include/std/string_view: Only include <bits/ranges_base.h>
	once, and only for C++20 and later.

Tested powerpc64le-linux. Committed to trunk.


--GU9ZSdIpubxokFjY
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="patch.txt"

commit bd1eb556b910fd4853ea83291e495d40adbcdf81
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Tue Jul 13 12:09:37 2021

    libstdc++: Remove duplicate #include in <string_view>
    
    When I added the new C++23 constructor I added a conditional include of
    <bits/ranges_base.h>, which was already being included unconditionally.
    This removes the unconditional include but changes the condition for the
    other one, so it's used for C++20 as well.
    
    Signed-off-by: Jonathan Wakely <jwakely@redhat.com>
    
    libstdc++-v3/ChangeLog:
    
            * include/std/string_view: Only include <bits/ranges_base.h>
            once, and only for C++20 and later.

diff --git a/libstdc++-v3/include/std/string_view b/libstdc++-v3/include/std/string_view
index 33e2129383a..cfdcf28f026 100644
--- a/libstdc++-v3/include/std/string_view
+++ b/libstdc++-v3/include/std/string_view
@@ -41,11 +41,10 @@
 #include <bits/char_traits.h>
 #include <bits/functional_hash.h>
 #include <bits/range_access.h>
-#include <bits/ranges_base.h>
 #include <bits/ostream_insert.h>
 #include <ext/numeric_traits.h>
 
-#if __cplusplus > 202002L
+#if __cplusplus >= 202002L
 # include <bits/ranges_base.h>
 #endif
 

--GU9ZSdIpubxokFjY--