Subject: [Boost-commit] svn:boost r70704 - in branches/release: boost/detail boost/graph/distributed libs/graph/test
From: jewillco_at_[hidden]
Date: 2011-03-29 15:07:17
Author: jewillco
Date: 2011-03-29 15:07:16 EDT (Tue, 29 Mar 2011)
New Revision: 70704
URL: http://svn.boost.org/trac/boost/changeset/70704
Log:
Merged more fixes from trunk; added is_sorted.hpp because that is needed for BGL fixes
Added:
branches/release/boost/detail/is_sorted.hpp
- copied unchanged from r70701, /trunk/boost/detail/is_sorted.hpp
Text files modified:
branches/release/boost/graph/distributed/connected_components.hpp | 16 +++++++++-------
branches/release/libs/graph/test/all_planar_input_files_test.cpp | 2 ++
branches/release/libs/graph/test/parallel_edges_loops_test.cpp | 2 ++
3 files changed, 13 insertions(+), 7 deletions(-)
Modified: branches/release/boost/graph/distributed/connected_components.hpp
==============================================================================
--- branches/release/boost/graph/distributed/connected_components.hpp (original)
+++ branches/release/boost/graph/distributed/connected_components.hpp 2011-03-29 15:07:16 EDT (Tue, 29 Mar 2011)
@@ -14,6 +14,7 @@
#error "Parallel BGL files should not be included unless <boost/graph/use_mpi.hpp> has been included"
#endif
+#include <boost/detail/is_sorted.hpp>
#include <boost/assert.hpp>
#include <boost/property_map/property_map.hpp>
#include <boost/property_map/parallel/caching_property_map.hpp>
@@ -28,6 +29,7 @@
#include <boost/graph/named_function_params.hpp>
#include <boost/graph/parallel/process_group.hpp>
#include <boost/optional.hpp>
+#include <functional>
#include <algorithm>
#include <vector>
#include <list>
@@ -390,14 +392,14 @@
*aliter = get(p, *aliter);
my_adj.erase
- (remove_if(my_adj.begin(), my_adj.end(),
+ (std::remove_if(my_adj.begin(), my_adj.end(),
cull_adjacency_list<vertex_descriptor,
ParentMap>(*liter, p) ),
my_adj.end());
// This sort needs to be here to make sure the initial
// adjacency list is sorted
- sort(my_adj.begin(), my_adj.end(), std::less<vertex_descriptor>());
- my_adj.erase(unique(my_adj.begin(), my_adj.end()), my_adj.end());
+ std::sort(my_adj.begin(), my_adj.end(), std::less<vertex_descriptor>());
+ my_adj.erase(std::unique(my_adj.begin(), my_adj.end()), my_adj.end());
}
// Get p(v) for the new adjacent roots
@@ -629,15 +631,15 @@
// the most potential to hook to at each step
std::vector<vertex_descriptor>& my_adj = adj[*liter];
my_adj.erase
- (remove_if(my_adj.begin(), my_adj.end(),
+ (std::remove_if(my_adj.begin(), my_adj.end(),
cull_adjacency_list<vertex_descriptor,
ParentMap>(*liter, p) ),
my_adj.end());
#ifndef PBGL_IN_PLACE_MERGE
- sort(my_adj.begin(), my_adj.end(),
+ std::sort(my_adj.begin(), my_adj.end(),
std::less<vertex_descriptor>() );
#endif
- my_adj.erase(unique(my_adj.begin(), my_adj.end()), my_adj.end());
+ my_adj.erase(std::unique(my_adj.begin(), my_adj.end()), my_adj.end());
}
// Reduce result of empty root list test
@@ -679,7 +681,7 @@
std::vector<vertex_descriptor> my_roots, all_roots;
BGL_FORALL_VERTICES_T(v, g, Graph) {
- if( find( my_roots.begin(), my_roots.end(), get(p, v) )
+ if( std::find( my_roots.begin(), my_roots.end(), get(p, v) )
== my_roots.end() )
my_roots.push_back( get(p, v) );
}
Modified: branches/release/libs/graph/test/all_planar_input_files_test.cpp
==============================================================================
--- branches/release/libs/graph/test/all_planar_input_files_test.cpp (original)
+++ branches/release/libs/graph/test/all_planar_input_files_test.cpp 2011-03-29 15:07:16 EDT (Tue, 29 Mar 2011)
@@ -18,6 +18,8 @@
*/
+#define BOOST_FILESYSTEM_VERSION 3
+
#include <iostream>
#include <fstream>
#include <vector>
Modified: branches/release/libs/graph/test/parallel_edges_loops_test.cpp
==============================================================================
--- branches/release/libs/graph/test/parallel_edges_loops_test.cpp (original)
+++ branches/release/libs/graph/test/parallel_edges_loops_test.cpp 2011-03-29 15:07:16 EDT (Tue, 29 Mar 2011)
@@ -16,6 +16,8 @@
*/
+#define BOOST_FILESYSTEM_VERSION 3
+
#include <iostream>
#include <fstream>
#include <vector>