-
Notifications
You must be signed in to change notification settings - Fork 0
/
boost-1-fixes.patch
57 lines (47 loc) · 2.26 KB
/
boost-1-fixes.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <[email protected]>
Date: Wed, 8 Apr 2020 00:37:10 +1000
Subject: [PATCH 1/2] fix darwin build
diff --git a/tools/build/src/tools/darwin.jam b/tools/build/src/tools/darwin.jam
index 1111111..2222222 100644
--- a/tools/build/src/tools/darwin.jam
+++ b/tools/build/src/tools/darwin.jam
@@ -138,11 +138,6 @@ rule init ( version ? : command * : options * : requirement * )
common.handle-options darwin : $(condition) : $(command) : $(options) ;
real-version = [ regex.split $(real-version) \\. ] ;
- # - GCC 4.0 and higher in Darwin does not have -fcoalesce-templates.
- if [ version.version-less $(real-version) : 4 0 ]
- {
- flags darwin.compile.c++ OPTIONS $(condition) : -fcoalesce-templates ;
- }
# - GCC 4.2 and higher in Darwin does not have -Wno-long-double.
if [ version.version-less $(real-version) : 4 2 ]
{
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <[email protected]>
Date: Mon, 6 Jun 2022 16:55:21 +0300
Subject: [PATCH 2/2] Fix incomplete type error when using list and pair
Example:
boost::container::list<std::pair<int, int>> list;
.../boost/container/allocator_traits.hpp:403:11: error: invalid use of incomplete type 'struct boost::container::dtl::pair<int, int>'
403 | { p->~T(); (void)p; }
| ~~~~^
In file included from .../boost/container/detail/node_alloc_holder.hpp:39,
from .../boost/container/list.hpp:34:
.../boost/container/detail/is_pair.hpp:59:8: note: declaration of 'struct boost::container::dtl::pair<int, int>'
59 | struct pair;
| ^~~~
diff --git a/boost/container/list.hpp b/boost/container/list.hpp
index 1111111..2222222 100644
--- a/boost/container/list.hpp
+++ b/boost/container/list.hpp
@@ -32,6 +32,7 @@
#include <boost/container/detail/iterators.hpp>
#include <boost/container/detail/mpl.hpp>
#include <boost/container/detail/node_alloc_holder.hpp>
+#include <boost/container/detail/pair.hpp>
#include <boost/container/detail/version_type.hpp>
#include <boost/container/detail/value_functors.hpp>
// move