boost/graph
2
0
Fork 0
mirror of https://github.com/boostorg/graph.git synced 2026-02-01 20:42:11 +00:00
Code Issues Projects Releases Wiki Activity

Merged r64025 and r64030 (detail qualification on override_const_property) from trunk

Browse Source 
[SVN r64049]
This commit is contained in:
Jeremiah Willcock
2010-07-15 15:52:14 +00:00
parent bd4c4438ba
commit 862c7637cd
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/boost/graph/astar_search.hpp
View File

@@ -332,8 +332,8 @@ namespace boost {
arg_pack[_predecessor_map | dummy_property_map()],
detail::make_property_map_from_arg_pack_gen<tag::rank_map, D>(D())(g, arg_pack),
detail::make_property_map_from_arg_pack_gen<tag::distance_map, W>(W())(g, arg_pack),
override_const_property(arg_pack, _weight_map, g, edge_weight),
override_const_property(arg_pack, _vertex_index_map, g, vertex_index),
detail::override_const_property(arg_pack, _weight_map, g, edge_weight),
detail::override_const_property(arg_pack, _vertex_index_map, g, vertex_index),
detail::make_color_map_from_arg_pack(g, arg_pack),
arg_pack[_distance_compare | std::less<D>()],
arg_pack[_distance_combine | closed_plus<D>()],
@@ -364,8 +364,8 @@ namespace boost {
arg_pack[_predecessor_map | dummy_property_map()],
detail::make_property_map_from_arg_pack_gen<tag::rank_map, D>(D())(g, arg_pack),
detail::make_property_map_from_arg_pack_gen<tag::distance_map, D>(D())(g, arg_pack),
override_const_property(arg_pack, _weight_map, g, edge_weight),
override_const_property(arg_pack, _vertex_index_map, g, vertex_index),
detail::override_const_property(arg_pack, _weight_map, g, edge_weight),
detail::override_const_property(arg_pack, _vertex_index_map, g, vertex_index),
detail::make_color_map_from_arg_pack(g, arg_pack),
arg_pack[_distance_compare | std::less<D>()],
arg_pack[_distance_combine | closed_plus<D>()],