Skip to content

Commit a649be5

Browse files
jeremy-murphyjeremy-murphy
authored
Merge pull request #305 from boostorg/develop
Merge develop into master for 1.80.0 release
2 parents c583bfa + 2862644 commit a649be5

11 files changed

+297
-151
lines changed

‎.drone.star

+30-28
Original file line numberDiff line numberDiff line change
@@ -127,34 +127,36 @@ def main(ctx):
127127
osx_cxx("XCode-11.7 17", "clang++", packages="", buildtype="boost", xcode_version="11.7", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '17', }, globalenv=globalenv),
128128
osx_cxx("XCode-11.7 2a", "clang++", packages="", buildtype="boost", xcode_version="11.7", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '2a', }, globalenv=globalenv),
129129

130-
osx_cxx("XCode-10.2 03", "clang++", packages="", buildtype="boost", xcode_version="10.2", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '03', }, globalenv=globalenv),
131-
osx_cxx("XCode-10.2 11", "clang++", packages="", buildtype="boost", xcode_version="10.2", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '11', }, globalenv=globalenv),
132-
osx_cxx("XCode-10.2 14", "clang++", packages="", buildtype="boost", xcode_version="10.2", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '14', }, globalenv=globalenv),
133-
# osx_cxx("XCode-10.2 17", "clang++", packages="", buildtype="boost", xcode_version="10.2", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '17', }, globalenv=globalenv),
134-
osx_cxx("XCode-10.2 2a", "clang++", packages="", buildtype="boost", xcode_version="10.2", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '2a', }, globalenv=globalenv),
135-
136-
osx_cxx("XCode-9.4 03", "clang++", packages="", buildtype="boost", xcode_version="9.4", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '03', }, globalenv=globalenv),
137-
osx_cxx("XCode-9.4 11", "clang++", packages="", buildtype="boost", xcode_version="9.4", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '11', }, globalenv=globalenv),
138-
osx_cxx("XCode-9.4 14", "clang++", packages="", buildtype="boost", xcode_version="9.4", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '14', }, globalenv=globalenv),
139-
osx_cxx("XCode-9.4 1z", "clang++", packages="", buildtype="boost", xcode_version="9.4", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '1z', }, globalenv=globalenv),
140-
141-
osx_cxx("XCode-9.0 03", "clang++", packages="", buildtype="boost", xcode_version="9", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '03', }, globalenv=globalenv),
142-
osx_cxx("XCode-9.0 11", "clang++", packages="", buildtype="boost", xcode_version="9", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '11', }, globalenv=globalenv),
143-
osx_cxx("XCode-9.0 14", "clang++", packages="", buildtype="boost", xcode_version="9", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '14', }, globalenv=globalenv),
144-
osx_cxx("XCode-9.0 1z", "clang++", packages="", buildtype="boost", xcode_version="9", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '1z', }, globalenv=globalenv),
145-
146-
osx_cxx("XCode-8.3 03", "clang++", packages="", buildtype="boost", xcode_version="8.3", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '03', }, globalenv=globalenv),
147-
osx_cxx("XCode-8.3 11", "clang++", packages="", buildtype="boost", xcode_version="8.3", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '11', }, globalenv=globalenv),
148-
osx_cxx("XCode-8.3 14", "clang++", packages="", buildtype="boost", xcode_version="8.3", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '14', }, globalenv=globalenv),
149-
osx_cxx("XCode-8.3 1z", "clang++", packages="", buildtype="boost", xcode_version="8.3", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '1z', }, globalenv=globalenv),
150-
151-
osx_cxx("XCode-8.0 03", "clang++", packages="", buildtype="boost", xcode_version="8", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '03', }, globalenv=globalenv),
152-
osx_cxx("XCode-8.0 11", "clang++", packages="", buildtype="boost", xcode_version="8", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '11', }, globalenv=globalenv),
153-
osx_cxx("XCode-8.0 14", "clang++", packages="", buildtype="boost", xcode_version="8", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '14', }, globalenv=globalenv),
154-
# osx_cxx("XCode-8.0 1z", "clang++", packages="", buildtype="boost", xcode_version="8", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '1z', }, globalenv=globalenv),
155-
156-
osx_cxx("XCode-7.3 03", "clang++", packages="", buildtype="boost", xcode_version="7.3", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '03', }, globalenv=globalenv),
157-
osx_cxx("XCode-7.3 11", "clang++", packages="", buildtype="boost", xcode_version="7.3", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '11', }, globalenv=globalenv),
130+
# We don't support these old versions of Xcode any more, but you are welcome to take up the challenge for doing so if you need them.
131+
132+
# osx_cxx("XCode-10.2 03", "clang++", packages="", buildtype="boost", xcode_version="10.2", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '03', }, globalenv=globalenv),
133+
# osx_cxx("XCode-10.2 11", "clang++", packages="", buildtype="boost", xcode_version="10.2", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '11', }, globalenv=globalenv),
134+
# osx_cxx("XCode-10.2 14", "clang++", packages="", buildtype="boost", xcode_version="10.2", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '14', }, globalenv=globalenv),
135+
# osx_cxx("XCode-10.2 17", "clang++", packages="", buildtype="boost", xcode_version="10.2", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '17', }, globalenv=globalenv),
136+
# osx_cxx("XCode-10.2 2a", "clang++", packages="", buildtype="boost", xcode_version="10.2", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '2a', }, globalenv=globalenv),
137+
138+
# osx_cxx("XCode-9.4 03", "clang++", packages="", buildtype="boost", xcode_version="9.4", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '03', }, globalenv=globalenv),
139+
# osx_cxx("XCode-9.4 11", "clang++", packages="", buildtype="boost", xcode_version="9.4", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '11', }, globalenv=globalenv),
140+
# osx_cxx("XCode-9.4 14", "clang++", packages="", buildtype="boost", xcode_version="9.4", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '14', }, globalenv=globalenv),
141+
# osx_cxx("XCode-9.4 1z", "clang++", packages="", buildtype="boost", xcode_version="9.4", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '1z', }, globalenv=globalenv),
142+
143+
# osx_cxx("XCode-9.0 03", "clang++", packages="", buildtype="boost", xcode_version="9", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '03', }, globalenv=globalenv),
144+
# osx_cxx("XCode-9.0 11", "clang++", packages="", buildtype="boost", xcode_version="9", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '11', }, globalenv=globalenv),
145+
# osx_cxx("XCode-9.0 14", "clang++", packages="", buildtype="boost", xcode_version="9", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '14', }, globalenv=globalenv),
146+
# osx_cxx("XCode-9.0 1z", "clang++", packages="", buildtype="boost", xcode_version="9", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '1z', }, globalenv=globalenv),
147+
148+
# osx_cxx("XCode-8.3 03", "clang++", packages="", buildtype="boost", xcode_version="8.3", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '03', }, globalenv=globalenv),
149+
# osx_cxx("XCode-8.3 11", "clang++", packages="", buildtype="boost", xcode_version="8.3", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '11', }, globalenv=globalenv),
150+
# osx_cxx("XCode-8.3 14", "clang++", packages="", buildtype="boost", xcode_version="8.3", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '14', }, globalenv=globalenv),
151+
# osx_cxx("XCode-8.3 1z", "clang++", packages="", buildtype="boost", xcode_version="8.3", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '1z', }, globalenv=globalenv),
152+
153+
# osx_cxx("XCode-8.0 03", "clang++", packages="", buildtype="boost", xcode_version="8", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '03', }, globalenv=globalenv),
154+
# osx_cxx("XCode-8.0 11", "clang++", packages="", buildtype="boost", xcode_version="8", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '11', }, globalenv=globalenv),
155+
# osx_cxx("XCode-8.0 14", "clang++", packages="", buildtype="boost", xcode_version="8", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '14', }, globalenv=globalenv),
156+
# osx_cxx("XCode-8.0 1z", "clang++", packages="", buildtype="boost", xcode_version="8", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '1z', }, globalenv=globalenv),
157+
158+
# osx_cxx("XCode-7.3 03", "clang++", packages="", buildtype="boost", xcode_version="7.3", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '03', }, globalenv=globalenv),
159+
# osx_cxx("XCode-7.3 11", "clang++", packages="", buildtype="boost", xcode_version="7.3", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '11', }, globalenv=globalenv),
158160
]
159161

160162
# from https://github.com/boostorg/boost-ci

‎.github/workflows/ci.yml

+41
Original file line numberDiff line numberDiff line change
@@ -223,3 +223,44 @@ jobs:
223223
- name: Test
224224
run: ..\..\..\b2 --hash address-model=64 cxxstd=14,17,20 toolset=msvc-14.2
225225
working-directory: ../boost-root/libs/graph/test
226+
windows_msvc_14_3:
227+
runs-on: windows-2022
228+
defaults:
229+
run:
230+
shell: cmd
231+
strategy:
232+
fail-fast: false
233+
matrix:
234+
toolset: [ msvc-14.3 ]
235+
steps:
236+
- uses: actions/checkout@v2
237+
with:
238+
fetch-depth: '0'
239+
- uses: mstachniuk/ci-skip@v1
240+
with:
241+
commit-filter: '[skip ci];[ci skip];[CI SKIP];[SKIP CI];***CI SKIP***;***SKIP CI***;[apple];[Apple];[APPLE];[linux];[Linux];[LINUX]'
242+
commit-filter-separator: ';'
243+
fail-fast: true
244+
- name: Checkout main boost
245+
run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root
246+
- name: Update tools/boostdep
247+
run: git submodule update --init tools/boostdep
248+
working-directory: ../boost-root
249+
- name: Copy files
250+
run: xcopy /s /e /q %GITHUB_WORKSPACE% libs\graph
251+
working-directory: ../boost-root
252+
- name: Install deps
253+
run: python tools/boostdep/depinst/depinst.py graph
254+
working-directory: ../boost-root
255+
- name: Bootstrap
256+
run: bootstrap
257+
working-directory: ../boost-root
258+
- name: Generate headers
259+
run: b2 headers
260+
working-directory: ../boost-root
261+
- name: Config info
262+
run: ..\..\..\b2 print_config_info cxxstd=14,17,20 address-model=64 toolset=msvc-14.3
263+
working-directory: ../boost-root/libs/config/test
264+
- name: Test
265+
run: ..\..\..\b2 --hash address-model=64 cxxstd=14,17,20 toolset=msvc-14.3
266+
working-directory: ../boost-root/libs/graph/test

‎doc/Graph.html

+2-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ <H3>Associated Types</H3>
8787
graph can be visited. The choices are <TT>incidence_graph_tag</TT>,
8888
<TT>adjacency_graph_tag</TT>, <TT>bidirectional_graph_tag</TT>,
8989
<TT>vertex_list_graph_tag</TT>, <TT>edge_list_graph_tag</TT>, and
90-
<TT>adjacency_matrix_tag</TT>.
90+
<TT>adjacency_matrix_tag</TT>. You can also create your own
91+
tag which should inherit from one or more of the above.
9192
</td>
9293
</tr>
9394

‎doc/graph_traits.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -200,9 +200,9 @@ <H2>Members</H2>
200200
The traversal category tags are:
201201
<tt>incidence_graph_tag, adjacency_graph_tag,
202202
bidirectional_graph_tag, vertex_list_graph_tag,
203-
edge_list_graph_tag, vertex_and_edge_list_graph_tag,
203+
edge_list_graph_tag,
204204
adjacency_matrix_tag</tt>. You can also create your own
205-
tag which should inherit from one of the above.
205+
tag which should inherit from one or more of the above.
206206
</td>
207207
</tr>
208208

‎include/boost/graph/astar_search.hpp

-1
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,6 @@ inline void astar_search_no_init_tree(const VertexListGraph& g,
328328
BOOST_THROW_EXCEPTION(negative_edge());
329329
bool decreased
330330
= relax(e, g, weight, predecessor, distance, combine, compare);
331-
combine(get(distance, v), e_weight);
332331
if (decreased)
333332
{
334333
vis.edge_relaxed(e, g);

‎include/boost/graph/boykov_kolmogorov_max_flow.hpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -1029,8 +1029,7 @@ boykov_kolmogorov_max_flow(Graph& g, CapacityEdgeMap cap,
10291029
* named-parameter version, some given
10301030
*/
10311031
template < class Graph, class P, class T, class R >
1032-
typename property_traits<
1033-
typename property_map< Graph, edge_capacity_t >::const_type >::value_type
1032+
typename detail::edge_capacity_value< Graph, P, T, R >::type
10341033
boykov_kolmogorov_max_flow(Graph& g,
10351034
typename graph_traits< Graph >::vertex_descriptor src,
10361035
typename graph_traits< Graph >::vertex_descriptor sink,

‎include/boost/graph/detail/d_ary_heap.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -204,10 +204,10 @@ class d_ary_heap_indirect
204204
// Get the parent of a given node in the heap
205205
static size_type parent(size_type index) { return (index - 1) / Arity; }
206206

207-
// Get the child_idx'th child of a given node; 0 <= child_idx < Arity
208-
static size_type child(size_type index, std::size_t child_idx)
207+
// Get the first child of a given node
208+
static size_type first_child(size_type index)
209209
{
210-
return index * Arity + child_idx + 1;
210+
return index * Arity + 1;
211211
}
212212

213213
// Swap two elements in the heap by index, updating index_in_heap
@@ -304,7 +304,7 @@ class d_ary_heap_indirect
304304
Value* data_ptr = &data[0];
305305
for (;;)
306306
{
307-
size_type first_child_index = child(index, 0);
307+
size_type first_child_index = first_child(index);
308308
if (first_child_index >= heap_size)
309309
break; /* No children */
310310
Value* child_base_ptr = data_ptr + first_child_index;

0 commit comments

Comments
 (0)