From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <redi@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2181)
 id 5C3F5398546F; Wed, 14 Jul 2021 15:00:00 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5C3F5398546F
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="utf-8"
From: Jonathan Wakely <redi@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org
Subject: [gcc r11-8740] libstdc++: Remove duplicate #include in <string_view>
X-Act-Checkin: gcc
X-Git-Author: Jonathan Wakely <jwakely@redhat.com>
X-Git-Refname: refs/heads/releases/gcc-11
X-Git-Oldrev: df115674b39d4004252b7d5e41d9751f2b77b0d8
X-Git-Newrev: 760baa2de0e8a99c9e25e56dfe94ab95ed64ab6c
Message-Id: <20210714150000.5C3F5398546F@sourceware.org>
Date: Wed, 14 Jul 2021 15:00:00 +0000 (GMT)
X-BeenThere: libstdc++-cvs@gcc.gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Libstdc++-cvs mailing list <libstdc++-cvs.gcc.gnu.org>
List-Unsubscribe: <https://gcc.gnu.org/mailman/options/libstdc++-cvs>,
 <mailto:libstdc++-cvs-request@gcc.gnu.org?subject=unsubscribe>
List-Archive: <https://gcc.gnu.org/pipermail/libstdc++-cvs/>
List-Help: <mailto:libstdc++-cvs-request@gcc.gnu.org?subject=help>
List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/libstdc++-cvs>,
 <mailto:libstdc++-cvs-request@gcc.gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Jul 2021 15:00:00 -0000

https://gcc.gnu.org/g:760baa2de0e8a99c9e25e56dfe94ab95ed64ab6c

commit r11-8740-g760baa2de0e8a99c9e25e56dfe94ab95ed64ab6c
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Tue Jul 13 12:09:37 2021 +0100

    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.
    
    (cherry picked from commit bd1eb556b910fd4853ea83291e495d40adbcdf81)

Diff:
---
 libstdc++-v3/include/std/string_view | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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