[Boost-commit] svn:boost r61245 - in trunk/boost/graph: . detail

Subject: [Boost-commit] svn:boost r61245 - in trunk/boost/graph: . detail
From: jewillco_at_[hidden]
Date: 2010-04-13 09:55:24

Author: jewillco
Date: 2010-04-13 09:55:20 EDT (Tue, 13 Apr 2010)
New Revision: 61245
URL: http://svn.boost.org/trac/boost/changeset/61245

Log:
Fixed VC10 errors and warnings in subgraph tests; fixes #4093
Text files modified: 
   trunk/boost/graph/detail/labeled_graph_traits.hpp |     2 +-                                      
   trunk/boost/graph/graph_test.hpp                  |     6 +++---                                  
   2 files changed, 4 insertions(+), 4 deletions(-)

Modified: trunk/boost/graph/detail/labeled_graph_traits.hpp
==============================================================================
--- trunk/boost/graph/detail/labeled_graph_traits.hpp	(original)
+++ trunk/boost/graph/detail/labeled_graph_traits.hpp	2010-04-13 09:55:20 EDT (Tue, 13 Apr 2010)
@@ -187,7 +187,7 @@
     >
 { };
 
-template <typename> class graph_mutability_traits;
+template <typename> struct graph_mutability_traits;
 
 namespace graph_detail {
     // The determine mutability metafunction computes a labeled mutability tag

Modified: trunk/boost/graph/graph_test.hpp
==============================================================================
--- trunk/boost/graph/graph_test.hpp	(original)
+++ trunk/boost/graph/graph_test.hpp	2010-04-13 09:55:20 EDT (Tue, 13 Apr 2010)
@@ -153,7 +153,7 @@
       typedef typename graph_traits<Graph>::vertex_iterator v_iter;
       std::pair<v_iter, v_iter> p = vertices(g);
       BOOST_CHECK(num_vertices(g) == vertex_set.size());
-      v_size_t n = std::distance(p.first, p.second);
+      v_size_t n = (size_t)std::distance(p.first, p.second);
       BOOST_CHECK(n == num_vertices(g));
       for (; p.first != p.second; ++p.first) {
         vertex_t v = *p.first;
@@ -173,7 +173,7 @@
       BOOST_CHECK(m == num_edges(g));
       for (; p.first != p.second; ++p.first) {
         edge_t e = *p.first;
-        BOOST_CHECK(find_if(edge_set, connects(source(e, g), target(e, g), g)) != end(edge_set));
+        BOOST_CHECK(find_if(edge_set, connects(source(e, g), target(e, g), g)) != boost::end(edge_set));
         BOOST_CHECK(container_contains(vertex_set, source(e, g)) == true);
         BOOST_CHECK(container_contains(vertex_set, target(e, g)) == true);
       }
@@ -199,7 +199,7 @@
           p = edge(*j, *k, g);
           if (p.second == true)
             BOOST_CHECK(find_if(edge_set, 
-              connects(source(p.first, g), target(p.first, g), g)) != end(edge_set));
+              connects(source(p.first, g), target(p.first, g), g)) != boost::end(edge_set));
         }
     }