From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <redi@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2181)
	id 4BA4F3858CDA; Fri,  7 Oct 2022 11:56:46 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4BA4F3858CDA
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org;
	s=default; t=1665143806;
	bh=1Nbmk6Wpby1ag0/dEubi9rI4Aaz2nWcZxp6tOTD+Km4=;
	h=From:To:Subject:Date:From;
	b=NVftDnwC6lmOWviJkMyS/16aIix5JwddDnRKoXOQo6xTFFHYyHIitjGDsgdBdeybg
	 lAEAt7ubtZskOu/gkuu09S/RS/uf5BpA0z3CE2D50IhGeqJ0Vfm8/Cti9PVL1CCczv
	 lR/RsQOjBI012bIyDlsR4ZaGTaxDO/esJo0S6um0=
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 r13-3159] libstdc++: Shuffle header dependencies of <functional>
X-Act-Checkin: gcc
X-Git-Author: Jonathan Wakely <jwakely@redhat.com>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: df78e15233c1dcf9b935c7380fc95359ebcc5562
X-Git-Newrev: 93b3ab6c0c6a44df50e9312c8106b4d1001d6205
Message-Id: <20221007115646.4BA4F3858CDA@sourceware.org>
Date: Fri,  7 Oct 2022 11:56:46 +0000 (GMT)
List-Id: <libstdc++-cvs.sourceware.org>

https://gcc.gnu.org/g:93b3ab6c0c6a44df50e9312c8106b4d1001d6205

commit r13-3159-g93b3ab6c0c6a44df50e9312c8106b4d1001d6205
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Thu Oct 6 14:34:49 2022 +0100

    libstdc++: Shuffle header dependencies of <functional>
    
    The <new> header is needed by std::function to use placement new, so
    include it in <bits/std_function.h> instead of in <functional>.
    
    libstdc++-v3/ChangeLog:
    
            * include/bits/std_function.h: Include <new> but do not include
            <bits/stl_function.h>.
            * include/std/functional: Do not include <new>.

Diff:
---
 libstdc++-v3/include/bits/std_function.h | 10 +++++-----
 libstdc++-v3/include/std/functional      |  7 +++----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/libstdc++-v3/include/bits/std_function.h b/libstdc++-v3/include/bits/std_function.h
index f5423a3a5c7..8ab32a6855e 100644
--- a/libstdc++-v3/include/bits/std_function.h
+++ b/libstdc++-v3/include/bits/std_function.h
@@ -36,11 +36,11 @@
 # include <bits/c++0x_warning.h>
 #else
 
-#include <typeinfo>
-#include <bits/stl_function.h>
-#include <bits/invoke.h>
-#include <bits/refwrap.h>
-#include <bits/functexcept.h>
+#include <new>                // placement new
+#include <typeinfo>           // typeid
+#include <bits/invoke.h>      // __invoke_r
+#include <bits/refwrap.h>     // ref wrapper, _Maybe_unary_or_binary_function
+#include <bits/functexcept.h> // __throw_bad_function_call
 
 namespace std _GLIBCXX_VISIBILITY(default)
 {
diff --git a/libstdc++-v3/include/std/functional b/libstdc++-v3/include/std/functional
index adf9cb1c546..d22acaa3cb8 100644
--- a/libstdc++-v3/include/std/functional
+++ b/libstdc++-v3/include/std/functional
@@ -46,11 +46,10 @@
 #pragma GCC system_header
 
 #include <bits/c++config.h>
-#include <bits/stl_function.h>
+#include <bits/stl_function.h> // std::equal_to, std::unary_function etc.
 
 #if __cplusplus >= 201103L
 
-#include <new>
 #include <tuple>
 #include <type_traits>
 #include <bits/functional_hash.h>
@@ -67,8 +66,8 @@
 # endif
 # include <bits/stl_algo.h> // std::search
 #endif
-#if __cplusplus > 201703L
-# include <bits/ranges_cmp.h>
+#if __cplusplus >= 202002L
+# include <bits/ranges_cmp.h> // std::identity, ranges::equal_to etc.
 # include <compare>
 #endif
 #if __cplusplus > 202002L && _GLIBCXX_HOSTED