From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <redi@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2181)
 id 5C15E385801F; Tue, 23 Nov 2021 21:17:50 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5C15E385801F
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-9269] libstdc++: Fix circular dependency for
 bitmap_allocator [PR103381]
X-Act-Checkin: gcc
X-Git-Author: Jonathan Wakely <jwakely@redhat.com>
X-Git-Refname: refs/heads/releases/gcc-11
X-Git-Oldrev: 667339efd8ee10079aac9684c5d1c9c9b28d9da6
X-Git-Newrev: 9a7308bac8c9a90c153a6f25f0c9bf7e2a0f2e73
Message-Id: <20211123211750.5C15E385801F@sourceware.org>
Date: Tue, 23 Nov 2021 21:17:50 +0000 (GMT)
X-BeenThere: gcc-cvs@gcc.gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Gcc-cvs mailing list <gcc-cvs.gcc.gnu.org>
List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=unsubscribe>
List-Archive: <https://gcc.gnu.org/pipermail/gcc-cvs/>
List-Help: <mailto:gcc-cvs-request@gcc.gnu.org?subject=help>
List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 23 Nov 2021 21:17:50 -0000

https://gcc.gnu.org/g:9a7308bac8c9a90c153a6f25f0c9bf7e2a0f2e73

commit r11-9269-g9a7308bac8c9a90c153a6f25f0c9bf7e2a0f2e73
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Tue Nov 23 12:28:22 2021 +0000

    libstdc++: Fix circular dependency for bitmap_allocator [PR103381]
    
    <ext/bitmap_allocator.h> includes <function>, and since C++17 that
    includes <unordered_map>. If std::allocator is defined in terms of
    __gnu_cxx::bitmap_allocator then you get a circular reference and
    bootstrap fails when compiling src/c++17/*.cc.
    
    libstdc++-v3/ChangeLog:
    
            PR libstdc++/103381
            * include/ext/bitmap_allocator.h: Include <bits/stl_function.h>
            instead of <functional>.
    
    (cherry picked from commit 5459fa132a99e6037e5ccf1b49d617677a584ff8)

Diff:
---
 libstdc++-v3/include/ext/bitmap_allocator.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libstdc++-v3/include/ext/bitmap_allocator.h b/libstdc++-v3/include/ext/bitmap_allocator.h
index cc80593764c..0444deb479c 100644
--- a/libstdc++-v3/include/ext/bitmap_allocator.h
+++ b/libstdc++-v3/include/ext/bitmap_allocator.h
@@ -31,7 +31,7 @@
 
 #include <utility> // For std::pair.
 #include <bits/functexcept.h> // For __throw_bad_alloc().
-#include <functional> // For greater_equal, and less_equal.
+#include <bits/stl_function.h> // For greater_equal, and less_equal.
 #include <new> // For operator new.
 #include <debug/debug.h> // _GLIBCXX_DEBUG_ASSERT
 #include <ext/concurrence.h>