[Boost-commit] svn:boost r53941 - in trunk/boost/graph: . distributed

Subject: [Boost-commit] svn:boost r53941 - in trunk/boost/graph: . distributed
From: jewillco_at_[hidden]
Date: 2009-06-15 14:25:00

Author: jewillco
Date: 2009-06-15 14:24:59 EDT (Mon, 15 Jun 2009)
New Revision: 53941
URL: http://svn.boost.org/trac/boost/changeset/53941

Log:
Fixed warnings; refs #3134
Text files modified: 
   trunk/boost/graph/distributed/betweenness_centrality.hpp |     8 ++++----                                
   trunk/boost/graph/rmat_graph_generator.hpp               |     2 +-                                      
   2 files changed, 5 insertions(+), 5 deletions(-)

Modified: trunk/boost/graph/distributed/betweenness_centrality.hpp
==============================================================================
--- trunk/boost/graph/distributed/betweenness_centrality.hpp	(original)
+++ trunk/boost/graph/distributed/betweenness_centrality.hpp	2009-06-15 14:24:59 EDT (Mon, 15 Jun 2009)
@@ -295,8 +295,8 @@
 #endif
                                              Dist delta)
     : g(g),
-      distance(distance),
       incoming(incoming),
+      distance(distance),
       weight(weight),
       path_count(path_count),
 #ifdef COMPUTE_PATH_COUNTS_INLINE
@@ -1047,7 +1047,7 @@
       vertices_size_type n = num_vertices(g);
       n = boost::parallel::all_reduce(pg, n, std::plus<vertices_size_type>());
       
-      for (int i = 0; i < n; ++i) {
+      for (vertices_size_type i = 0; i < n; ++i) {
         vertex_descriptor v = vertex(i, g);
 
         do_brandes_sssp(g, centrality, edge_centrality_map, incoming, distance,
@@ -1189,7 +1189,7 @@
       }
 
       // DO SSSPs
-      for(int i = 0; i < local_sources.size(); ++i)
+      for(size_t i = 0; i < local_sources.size(); ++i)
         do_sequential_brandes_sssp(g, centrality, edge_centrality_map, incoming,
                                    distance, dependency, path_count, vertex_index,
                                    shortest_paths, ordered_vertices, local_sources[i]);
@@ -1198,7 +1198,7 @@
       typedef typename graph_traits<Graph>::vertices_size_type vertices_size_type;
       vertices_size_type n = num_vertices(g);
       
-      for (int i = id; i < n; i += p) {
+      for (vertices_size_type i = id; i < n; i += p) {
         vertex_descriptor v = vertex(i, g);
 
         do_sequential_brandes_sssp(g, centrality, edge_centrality_map, incoming,

Modified: trunk/boost/graph/rmat_graph_generator.hpp
==============================================================================
--- trunk/boost/graph/rmat_graph_generator.hpp	(original)
+++ trunk/boost/graph/rmat_graph_generator.hpp	2009-06-15 14:24:59 EDT (Mon, 15 Jun 2009)
@@ -276,7 +276,7 @@
       // TODO: "Clip and flip" if undirected graph
       int SCALE = int_log2(n);
       
-      for (int i = 0; i < m; ++i) {
+      for (edges_size_type i = 0; i < m; ++i) {
 
         vertices_size_type u, v;
         tie(u, v) = generate_edge(this->gen, n, SCALE, a, b, c, d);