[Boost-commit] svn:boost r81042 - in branches/release: . boost boost/graph libs libs/graph/test

Subject: [Boost-commit] svn:boost r81042 - in branches/release: . boost boost/graph libs libs/graph/test
From: jhunold_at_[hidden]
Date: 2012-10-21 14:06:16

Author: jhunold
Date: 2012-10-21 14:06:15 EDT (Sun, 21 Oct 2012)
New Revision: 81042
URL: http://svn.boost.org/trac/boost/changeset/81042

Log:
Merge 80908,80939,80957 from ^/trunk

  ------------------------------------------------------------------------
  r80908 | jewillco | 2012-10-08 22:04:48 +0200 (Mo, 08 Okt 2012) | 1 line
  
  Added attempt at workaround for VC++ const graph type bug
  ------------------------------------------------------------------------
  r80939 | jewillco | 2012-10-10 19:27:44 +0200 (Mi, 10 Okt 2012) | 1 line
  
  Added another remove_const to work around VC++ 9 issues
  ------------------------------------------------------------------------
  r80957 | jewillco | 2012-10-11 18:45:33 +0200 (Do, 11 Okt 2012) | 1 line
  
  Added test from Juergen Hunold
  ------------------------------------------------------------------------

Added:
   branches/release/libs/graph/test/filtered_graph_properties_dijkstra.cpp
      - copied unchanged from r80957, /trunk/libs/graph/test/filtered_graph_properties_dijkstra.cpp
Properties modified: 
   branches/release/   (props changed)
   branches/release/boost/   (props changed)
   branches/release/boost/graph/   (props changed)
   branches/release/libs/   (props changed)
Text files modified: 
   branches/release/boost/graph/named_function_params.hpp |     4 ++--                                    
   branches/release/libs/graph/test/Jamfile.v2            |     1 +                                       
   2 files changed, 3 insertions(+), 2 deletions(-)

Modified: branches/release/boost/graph/named_function_params.hpp
==============================================================================
--- branches/release/boost/graph/named_function_params.hpp	(original)
+++ branches/release/boost/graph/named_function_params.hpp	2012-10-21 14:06:15 EDT (Sun, 21 Oct 2012)
@@ -278,13 +278,13 @@
 
     template <> struct choose_impl_helper<false> {
       template <typename Param, typename Graph, typename PropertyTag>
-      static typename property_map<Graph, PropertyTag>::const_type
+      static typename property_map<typename boost::remove_const<Graph>::type, PropertyTag>::const_type
       f(boost::mpl::true_, const Graph& g, const Param&, PropertyTag tag) {
         return get(tag, g);
       }
 
       template <typename Param, typename Graph, typename PropertyTag>
-      static typename property_map<Graph, PropertyTag>::type
+      static typename property_map<typename boost::remove_const<Graph>::type, PropertyTag>::type
       f(boost::mpl::false_, Graph& g, const Param&, PropertyTag tag) {
         return get(tag, g);
       }

Modified: branches/release/libs/graph/test/Jamfile.v2
==============================================================================
--- branches/release/libs/graph/test/Jamfile.v2	(original)
+++ branches/release/libs/graph/test/Jamfile.v2	2012-10-21 14:06:15 EDT (Sun, 21 Oct 2012)
@@ -123,6 +123,7 @@
     [ run random_spanning_tree_test.cpp ../build//boost_graph ]
     [ run graphml_test.cpp ../build//boost_graph : : "graphml_test.xml" ]
     [ run stoer_wagner_test.cpp ../../test/build//boost_unit_test_framework/<link>static : $(TEST_DIR) ]
+    [ compile filtered_graph_properties_dijkstra.cpp ]
     ;
 
 # Run SDB tests only when -sSDB= is set.