From 862c7637cd7c51404a72f207eaf2bbd89011b3cb Mon Sep 17 00:00:00 2001
From: Jeremiah Willcock <jewillco@osl.iu.edu>
Date: Thu, 15 Jul 2010 15:52:14 +0000
Subject: [PATCH] Merged r64025 and r64030 (detail qualification on
 override_const_property) from trunk

[SVN r64049]
---
 include/boost/graph/astar_search.hpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/boost/graph/astar_search.hpp b/include/boost/graph/astar_search.hpp
index 576ac56a..ae60113d 100644
--- a/include/boost/graph/astar_search.hpp
+++ b/include/boost/graph/astar_search.hpp
@@ -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>()],