[Boost-commit] svn:boost r62042 - in trunk: boost/graph/distributed boost/graph/distributed/adjlist libs/graph_parallel/test

Subject: [Boost-commit] svn:boost r62042 - in trunk: boost/graph/distributed boost/graph/distributed/adjlist libs/graph_parallel/test
From: jewillco_at_[hidden]
Date: 2010-05-16 14:06:26

Author: jewillco
Date: 2010-05-16 14:06:25 EDT (Sun, 16 May 2010)
New Revision: 62042
URL: http://svn.boost.org/trac/boost/changeset/62042

Log:
Fixed VC++10 warnings and errors
Text files modified: 
   trunk/boost/graph/distributed/adjlist/serialization.hpp            |     2 +-                                      
   trunk/boost/graph/distributed/rmat_graph_generator.hpp             |     3 ++-                                     
   trunk/libs/graph_parallel/test/distributed_shortest_paths_test.cpp |     6 +-----                                  
   3 files changed, 4 insertions(+), 7 deletions(-)

Modified: trunk/boost/graph/distributed/adjlist/serialization.hpp
==============================================================================
--- trunk/boost/graph/distributed/adjlist/serialization.hpp	(original)
+++ trunk/boost/graph/distributed/adjlist/serialization.hpp	2010-05-16 14:06:25 EDT (Sun, 16 May 2010)
@@ -77,7 +77,7 @@
 
   inline bool is_digit(char c)
   {
-      return std::isdigit(c);
+      return (bool)std::isdigit(c);
   }
 
   inline std::vector<int> 

Modified: trunk/boost/graph/distributed/rmat_graph_generator.hpp
==============================================================================
--- trunk/boost/graph/distributed/rmat_graph_generator.hpp	(original)
+++ trunk/boost/graph/distributed/rmat_graph_generator.hpp	2010-05-16 14:06:25 EDT (Sun, 16 May 2010)
@@ -15,6 +15,7 @@
 
 #include <boost/graph/parallel/algorithm.hpp>
 #include <boost/graph/parallel/process_group.hpp>
+#include <math.h>
 
 namespace boost {
 
@@ -59,7 +60,7 @@
           if (permute_vertices) 
               generate_permutation_vector(gen, vertexPermutation, n);
 
-          int SCALE = int(floor(log2(n)));
+          int SCALE = int(floor(log(n)/log(2.)));
           boost::uniform_01<RandomGenerator> prob(gen);
       
           std::map<value_type, bool> edge_map;

Modified: trunk/libs/graph_parallel/test/distributed_shortest_paths_test.cpp
==============================================================================
--- trunk/libs/graph_parallel/test/distributed_shortest_paths_test.cpp	(original)
+++ trunk/libs/graph_parallel/test/distributed_shortest_paths_test.cpp	2010-05-16 14:06:25 EDT (Sun, 16 May 2010)
@@ -22,8 +22,6 @@
 #include <boost/test/minimal.hpp>
 #include <boost/graph/iteration_macros.hpp>
 
-#include <sys/time.h>
-#include <time.h>
 #include <iostream>
 #include <iomanip>
 
@@ -43,9 +41,7 @@
 
 inline time_type get_time()
 {
-  timeval tp;
-  gettimeofday(&tp, 0);
-  return tp.tv_sec + tp.tv_usec / 1000000.0;
+  return MPI_Wtime();
 }
 
 std::string print_time(time_type t)