|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r85323 - in trunk: boost/graph boost/graph/distributed boost/graph/distributed/adjlist libs/graph/example libs/graph/test libs/graph_parallel/test libs/property_map/test
From: jewillco_at_[hidden]
Date: 2013-08-12 14:14:58
Author: jewillco
Date: 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013)
New Revision: 85323
URL: http://svn.boost.org/trac/boost/changeset/85323
Log:
Fixed unused typedef warnings from GCC 4.9; fixes #8877; fixes #8986
Text files modified:
trunk/boost/graph/bellman_ford_shortest_paths.hpp | 2 --
trunk/boost/graph/betweenness_centrality.hpp | 3 ---
trunk/boost/graph/bipartite.hpp | 1 -
trunk/boost/graph/breadth_first_search.hpp | 1 -
trunk/boost/graph/chrobak_payne_drawing.hpp | 1 -
trunk/boost/graph/closeness_centrality.hpp | 2 --
trunk/boost/graph/connected_components.hpp | 2 +-
trunk/boost/graph/core_numbers.hpp | 1 -
trunk/boost/graph/cuthill_mckee_ordering.hpp | 3 ---
trunk/boost/graph/dijkstra_shortest_paths_no_color_map.hpp | 2 --
trunk/boost/graph/distributed/adjacency_list.hpp | 6 ------
trunk/boost/graph/distributed/adjlist/redistribute.hpp | 1 -
trunk/boost/graph/distributed/adjlist/serialization.hpp | 5 -----
trunk/boost/graph/distributed/betweenness_centrality.hpp | 27 ---------------------------
trunk/boost/graph/distributed/boman_et_al_graph_coloring.hpp | 1 -
trunk/boost/graph/distributed/compressed_sparse_row_graph.hpp | 1 -
trunk/boost/graph/distributed/connected_components.hpp | 6 ------
trunk/boost/graph/distributed/connected_components_parallel_search.hpp | 2 --
trunk/boost/graph/distributed/crauser_et_al_shortest_paths.hpp | 7 -------
trunk/boost/graph/distributed/dehne_gotz_min_spanning_tree.hpp | 1 -
trunk/boost/graph/distributed/eager_dijkstra_shortest_paths.hpp | 7 -------
trunk/boost/graph/distributed/graphviz.hpp | 2 --
trunk/boost/graph/distributed/hohberg_biconnected_components.hpp | 2 --
trunk/boost/graph/distributed/named_graph.hpp | 3 ---
trunk/boost/graph/distributed/page_rank.hpp | 2 --
trunk/boost/graph/distributed/strong_components.hpp | 6 ------
trunk/boost/graph/edmonds_karp_max_flow.hpp | 1 -
trunk/boost/graph/fruchterman_reingold.hpp | 1 -
trunk/boost/graph/graph_utility.hpp | 4 ----
trunk/boost/graph/gursoy_atun_layout.hpp | 4 +---
trunk/boost/graph/is_straight_line_drawing.hpp | 3 ---
trunk/boost/graph/king_ordering.hpp | 5 -----
trunk/boost/graph/kruskal_min_spanning_tree.hpp | 1 -
trunk/boost/graph/maximum_adjacency_search.hpp | 4 +---
trunk/boost/graph/mcgregor_common_subgraphs.hpp | 1 -
trunk/boost/graph/metric_tsp_approx.hpp | 1 -
trunk/boost/graph/planar_canonical_ordering.hpp | 2 --
trunk/boost/graph/random.hpp | 2 --
trunk/boost/graph/random_spanning_tree.hpp | 1 -
trunk/boost/graph/read_dimacs.hpp | 1 -
trunk/boost/graph/stoer_wagner_min_cut.hpp | 8 ++------
trunk/boost/graph/tiernan_all_cycles.hpp | 1 -
trunk/boost/graph/transitive_closure.hpp | 4 ----
trunk/boost/graph/two_graphs_common_spanning_trees.hpp | 7 -------
trunk/boost/graph/vf2_sub_graph_iso.hpp | 4 ----
trunk/boost/graph/write_dimacs.hpp | 4 ----
trunk/libs/graph/example/astar-cities.cpp | 1 -
trunk/libs/graph/example/bfs-example.cpp | 1 -
trunk/libs/graph/example/bfs-example2.cpp | 1 -
trunk/libs/graph/example/dfs-example.cpp | 1 -
trunk/libs/graph/example/dijkstra-example-listS.cpp | 1 -
trunk/libs/graph/example/dijkstra-example.cpp | 1 -
trunk/libs/graph/example/dijkstra-no-color-map-example.cpp | 1 -
trunk/libs/graph/example/mcgregor_subgraphs_example.cpp | 4 ----
trunk/libs/graph/example/stoer_wagner.cpp | 1 -
trunk/libs/graph/example/subgraph.cpp | 1 -
trunk/libs/graph/test/adj_list_loops.cpp | 4 ----
trunk/libs/graph/test/all_planar_input_files_test.cpp | 2 --
trunk/libs/graph/test/astar_search_test.cpp | 1 -
trunk/libs/graph/test/closeness_centrality.cpp | 2 --
trunk/libs/graph/test/clustering_coefficient.cpp | 4 +---
trunk/libs/graph/test/cycle_ratio_tests.cpp | 1 -
trunk/libs/graph/test/degree_centrality.cpp | 2 --
trunk/libs/graph/test/dijkstra_no_color_map_compare.cpp | 3 ---
trunk/libs/graph/test/eccentricity.cpp | 2 --
trunk/libs/graph/test/graphviz_test.cpp | 3 ---
trunk/libs/graph/test/index_graph.cpp | 1 -
trunk/libs/graph/test/layout_test.cpp | 2 --
trunk/libs/graph/test/matching_test.cpp | 1 -
trunk/libs/graph/test/mcgregor_subgraphs_test.cpp | 7 -------
trunk/libs/graph/test/mean_geodesic.cpp | 2 --
trunk/libs/graph/test/metric_tsp_approx.cpp | 2 --
trunk/libs/graph/test/parallel_edges_loops_test.cpp | 2 --
trunk/libs/graph/test/property_iter.cpp | 10 ----------
trunk/libs/graph/test/sequential_vertex_coloring.cpp | 1 -
trunk/libs/graph/test/stoer_wagner_test.cpp | 16 ----------------
trunk/libs/graph/test/subgraph.cpp | 1 -
trunk/libs/graph/test/test_properties.hpp | 3 ---
trunk/libs/graph/test/tiernan_all_cycles.cpp | 2 --
trunk/libs/graph_parallel/test/adjlist_redist_test.cpp | 1 -
trunk/libs/graph_parallel/test/adjlist_remove_test.cpp | 1 -
trunk/libs/graph_parallel/test/distributed_betweenness_centrality_test.cpp | 3 ---
trunk/libs/graph_parallel/test/distributed_connected_components_test.cpp | 5 -----
trunk/libs/graph_parallel/test/distributed_csr_algorithm_test.cpp | 1 -
trunk/libs/graph_parallel/test/distributed_dfs_test.cpp | 1 -
trunk/libs/graph_parallel/test/distributed_graph_coloring_test.cpp | 2 --
trunk/libs/graph_parallel/test/distributed_mst_test.cpp | 2 --
trunk/libs/graph_parallel/test/distributed_shortest_paths_test.cpp | 3 ---
trunk/libs/graph_parallel/test/distributed_st_connected_test.cpp | 2 --
trunk/libs/graph_parallel/test/distributed_strong_components_test.cpp | 5 -----
trunk/libs/property_map/test/property_map_cc.cpp | 1 -
91 files changed, 6 insertions(+), 264 deletions(-)
Modified: trunk/boost/graph/bellman_ford_shortest_paths.hpp
==============================================================================
--- trunk/boost/graph/bellman_ford_shortest_paths.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/boost/graph/bellman_ford_shortest_paths.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -102,8 +102,6 @@
typedef typename GTraits::vertex_descriptor Vertex;
BOOST_CONCEPT_ASSERT(( ReadWritePropertyMapConcept<DistanceMap, Vertex> ));
BOOST_CONCEPT_ASSERT(( ReadablePropertyMapConcept<WeightMap, Edge> ));
- typedef typename property_traits<DistanceMap>::value_type D_value;
- typedef typename property_traits<WeightMap>::value_type W_value;
typename GTraits::edge_iterator i, end;
Modified: trunk/boost/graph/betweenness_centrality.hpp
==============================================================================
--- trunk/boost/graph/betweenness_centrality.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/boost/graph/betweenness_centrality.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -296,7 +296,6 @@
ShortestPaths shortest_paths)
{
typedef typename graph_traits<Graph>::vertex_iterator vertex_iterator;
- typedef typename graph_traits<Graph>::edge_iterator edge_iterator;
typedef typename graph_traits<Graph>::vertex_descriptor vertex_descriptor;
// Initialize centrality
@@ -421,7 +420,6 @@
VertexIndexMap vertex_index)
{
typedef typename graph_traits<Graph>::degree_size_type degree_size_type;
- typedef typename graph_traits<Graph>::vertex_descriptor vertex_descriptor;
typedef typename graph_traits<Graph>::edge_descriptor edge_descriptor;
typedef typename mpl::if_c<(is_same<CentralityMap,
dummy_property_map>::value),
@@ -457,7 +455,6 @@
VertexIndexMap vertex_index)
{
typedef typename graph_traits<Graph>::degree_size_type degree_size_type;
- typedef typename graph_traits<Graph>::vertex_descriptor vertex_descriptor;
typedef typename graph_traits<Graph>::edge_descriptor edge_descriptor;
typedef typename mpl::if_c<(is_same<CentralityMap,
dummy_property_map>::value),
Modified: trunk/boost/graph/bipartite.hpp
==============================================================================
--- trunk/boost/graph/bipartite.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/boost/graph/bipartite.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -198,7 +198,6 @@
/// General types and variables
typedef typename property_traits <PartitionMap>::value_type partition_color_t;
typedef typename graph_traits <Graph>::vertex_descriptor vertex_descriptor_t;
- typedef typename graph_traits <Graph>::vertex_iterator vertex_iterator_t;
/// Declare dfs visitor
// detail::empty_recorder recorder;
Modified: trunk/boost/graph/breadth_first_search.hpp
==============================================================================
--- trunk/boost/graph/breadth_first_search.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/boost/graph/breadth_first_search.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -64,7 +64,6 @@
BOOST_CONCEPT_ASSERT(( IncidenceGraphConcept<IncidenceGraph> ));
typedef graph_traits<IncidenceGraph> GTraits;
typedef typename GTraits::vertex_descriptor Vertex;
- typedef typename GTraits::edge_descriptor Edge;
BOOST_CONCEPT_ASSERT(( BFSVisitorConcept<BFSVisitor, IncidenceGraph> ));
BOOST_CONCEPT_ASSERT(( ReadWritePropertyMapConcept<ColorMap, Vertex> ));
typedef typename property_traits<ColorMap>::value_type ColorValue;
Modified: trunk/boost/graph/chrobak_payne_drawing.hpp
==============================================================================
--- trunk/boost/graph/chrobak_payne_drawing.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/boost/graph/chrobak_payne_drawing.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -73,7 +73,6 @@
{
typedef typename graph_traits<Graph>::vertex_descriptor vertex_t;
- typedef typename graph_traits<Graph>::edge_descriptor edge_t;
typedef typename graph_traits<Graph>::vertex_iterator vertex_iterator_t;
typedef typename PlanarEmbedding::value_type::const_iterator
edge_permutation_iterator_t;
Modified: trunk/boost/graph/closeness_centrality.hpp
==============================================================================
--- trunk/boost/graph/closeness_centrality.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/boost/graph/closeness_centrality.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -123,7 +123,6 @@
typedef typename property_traits<DistanceMatrixMap>::value_type DistanceMap;
BOOST_CONCEPT_ASSERT(( ReadablePropertyMapConcept<DistanceMap,Vertex> ));
BOOST_CONCEPT_ASSERT(( WritablePropertyMapConcept<CentralityMap,Vertex> ));
- typedef typename property_traits<DistanceMap>::value_type Distance;
typedef typename property_traits<CentralityMap>::value_type Centrality;
typename graph_traits<Graph>::vertex_iterator i, end;
@@ -147,7 +146,6 @@
BOOST_CONCEPT_ASSERT(( ReadablePropertyMapConcept<DistanceMatrixMap,Vertex> ));
typedef typename property_traits<DistanceMatrixMap>::value_type DistanceMap;
BOOST_CONCEPT_ASSERT(( ReadablePropertyMapConcept<DistanceMap,Vertex> ));
- typedef typename property_traits<DistanceMap>::value_type Distance;
typedef typename property_traits<CentralityMap>::value_type Result;
all_closeness_centralities(g, dist, cent, measure_closeness<Result>(g, DistanceMap()));
Modified: trunk/boost/graph/connected_components.hpp
==============================================================================
--- trunk/boost/graph/connected_components.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/boost/graph/connected_components.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -86,7 +86,7 @@
typedef typename graph_traits<Graph>::vertex_descriptor Vertex;
BOOST_CONCEPT_ASSERT(( WritablePropertyMapConcept<ComponentMap, Vertex> ));
- typedef typename boost::graph_traits<Graph>::directed_category directed;
+ // typedef typename boost::graph_traits<Graph>::directed_category directed;
// BOOST_STATIC_ASSERT((boost::is_same<directed, undirected_tag>::value));
typedef typename property_traits<ComponentMap>::value_type comp_type;
Modified: trunk/boost/graph/core_numbers.hpp
==============================================================================
--- trunk/boost/graph/core_numbers.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/boost/graph/core_numbers.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -316,7 +316,6 @@
core_numbers(Graph& g, CoreMap c, EdgeWeightMap wm, VertexIndexMap vim,
CoreNumVisitor vis)
{
- typedef typename graph_traits<Graph>::vertices_size_type size_type;
detail::compute_in_degree_map(g,c,wm);
return detail::core_numbers_dispatch(g,c,wm,vim,vis);
}
Modified: trunk/boost/graph/cuthill_mckee_ordering.hpp
==============================================================================
--- trunk/boost/graph/cuthill_mckee_ordering.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/boost/graph/cuthill_mckee_ordering.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -75,7 +75,6 @@
{
//create queue, visitor...don't forget namespaces!
- typedef typename property_traits<DegreeMap>::value_type ds_type;
typedef typename graph_traits<Graph>::vertex_descriptor Vertex;
typedef typename boost::sparse::sparse_ordering_queue<Vertex> queue;
typedef typename detail::bfs_rcm_visitor<OutputIterator, queue, DegreeMap> Visitor;
@@ -137,7 +136,6 @@
return permutation;
typedef typename boost::graph_traits<Graph>::vertex_descriptor Vertex;
- typedef typename boost::graph_traits<Graph>::vertex_iterator VerIter;
typedef typename property_traits<ColorMap>::value_type ColorValue;
typedef color_traits<ColorValue> Color;
@@ -172,7 +170,6 @@
if (boost::graph::has_no_vertices(G))
return permutation;
- typedef out_degree_property_map<Graph> DegreeMap;
std::vector<default_color_type> colors(num_vertices(G));
return cuthill_mckee_ordering(G, permutation,
make_iterator_property_map(&colors[0],
Modified: trunk/boost/graph/dijkstra_shortest_paths_no_color_map.hpp
==============================================================================
--- trunk/boost/graph/dijkstra_shortest_paths_no_color_map.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/boost/graph/dijkstra_shortest_paths_no_color_map.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -41,7 +41,6 @@
{
typedef typename graph_traits<Graph>::vertex_descriptor Vertex;
typedef typename property_traits<DistanceMap>::value_type Distance;
- typedef typename property_traits<WeightMap>::value_type Weight;
typedef indirect_cmp<DistanceMap, DistanceCompare> DistanceIndirectCompare;
DistanceIndirectCompare
@@ -92,7 +91,6 @@
}
// Examine neighbors of min_vertex
- typedef typename graph_traits<Graph>::edge_descriptor Edge;
BGL_FORALL_OUTEDGES_T(min_vertex, current_edge, graph, Graph) {
visitor.examine_edge(current_edge, graph);
Modified: trunk/boost/graph/distributed/adjacency_list.hpp
==============================================================================
--- trunk/boost/graph/distributed/adjacency_list.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/boost/graph/distributed/adjacency_list.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -2501,9 +2501,6 @@
std::pair<edge_descriptor, bool> result
= this->add_local_edge(property, directedS());
- typedef detail::parallel::stored_in_edge<local_edge_descriptor>
- stored_edge;
-
if (result.second) {
if (target.owner == self.processor()) {
// Edge is local, so add the new edge to the list
@@ -3046,8 +3043,6 @@
PBGL_DISTRIB_ADJLIST_TYPE& g)
{
typedef typename PBGL_DISTRIB_ADJLIST_TYPE
- ::vertex_descriptor vertex_descriptor;
- typedef typename PBGL_DISTRIB_ADJLIST_TYPE
::edge_descriptor edge_descriptor;
std::pair<edge_descriptor, bool> the_edge = edge(u, v, g);
if (the_edge.second) remove_edge(the_edge.first, g);
@@ -3777,7 +3772,6 @@
template<PBGL_DISTRIB_ADJLIST_TEMPLATE_PARMS>
void synchronize(const PBGL_DISTRIB_ADJLIST_TYPE& g)
{
- typedef PBGL_DISTRIB_ADJLIST_TYPE graph_type;
synchronize(g.process_group());
}
Modified: trunk/boost/graph/distributed/adjlist/redistribute.hpp
==============================================================================
--- trunk/boost/graph/distributed/adjlist/redistribute.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/boost/graph/distributed/adjlist/redistribute.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -179,7 +179,6 @@
typedef detail::parallel::redistributed_descriptor<edge_descriptor,
edge_property_type>
redistributed_edge;
- typedef std::pair<vertices_size_type, edges_size_type> num_relocated_pair;
vertex_iterator vi, vi_end;
edge_iterator ei, ei_end;
Modified: trunk/boost/graph/distributed/adjlist/serialization.hpp
==============================================================================
--- trunk/boost/graph/distributed/adjlist/serialization.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/boost/graph/distributed/adjlist/serialization.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -776,7 +776,6 @@
process_id_type id = g.processor();
- typedef std::pair<local_vertex_descriptor, vertex_descriptor> in_edge;
std::vector<edge_descriptor> saved_in_edges;
BGL_FORALL_VERTICES_T(v, g, Graph)
@@ -830,8 +829,6 @@
process_id_type;
typedef typename graph_traits<
Graph>::vertex_descriptor vertex_descriptor;
- typedef typename graph_traits<
- Graph>::edge_descriptor edge_descriptor;
typedef typename Graph::edge_property_type edge_property_type;
@@ -880,8 +877,6 @@
template <class IStreamConstructibleArchive>
void PBGL_DISTRIB_ADJLIST_TYPE::load(std::string const& filename)
{
- typedef typename config_type::VertexListS vertex_list_selector;
-
process_group_type pg = process_group();
process_id_type id = process_id(pg);
Modified: trunk/boost/graph/distributed/betweenness_centrality.hpp
==============================================================================
--- trunk/boost/graph/distributed/betweenness_centrality.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/boost/graph/distributed/betweenness_centrality.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -621,12 +621,6 @@
#endif
)
{
- typedef typename property_traits<DistanceMap>::value_type
- distance_type;
-
- typedef std::plus<distance_type> Combine;
- typedef std::less<distance_type> Compare;
-
// The "distance" map needs to act like one, retrieving the default
// value of infinity.
set_property_map_role(vertex_distance, distance);
@@ -717,7 +711,6 @@
using boost::graph::parallel::process_group;
typedef typename graph_traits<Graph>::vertex_descriptor vertex_descriptor;
- typedef typename graph_traits<Graph>::vertex_iterator vertex_iterator;
typedef typename graph_traits<Graph>::edges_size_type edges_size_type;
typedef typename property_traits<IncomingMap>::value_type incoming_type;
@@ -974,10 +967,7 @@
using boost::detail::graph::divide_centrality_by_two;
using boost::graph::parallel::process_group;
- typedef typename graph_traits<Graph>::vertex_iterator vertex_iterator;
- typedef typename graph_traits<Graph>::edge_iterator edge_iterator;
typedef typename graph_traits<Graph>::vertex_descriptor vertex_descriptor;
- typedef typename graph_traits<Graph>::vertices_size_type vertices_size_type;
typedef typename property_traits<DistanceMap>::value_type distance_type;
typedef typename property_traits<DependencyMap>::value_type dependency_type;
@@ -1064,11 +1054,8 @@
{
using boost::detail::graph::update_centrality;
- typedef typename graph_traits<Graph>::vertex_iterator vertex_iterator;
typedef typename graph_traits<Graph>::vertex_descriptor vertex_descriptor;
- typedef typename property_traits<IncomingMap>::value_type incoming_type;
-
// Initialize for this iteration
BGL_FORALL_VERTICES_T(w, g, Graph) {
// put(path_count, w, 0);
@@ -1137,12 +1124,7 @@
using boost::detail::graph::divide_centrality_by_two;
using boost::graph::parallel::process_group;
- typedef typename graph_traits<Graph>::vertex_iterator vertex_iterator;
- typedef typename graph_traits<Graph>::edge_iterator edge_iterator;
typedef typename graph_traits<Graph>::vertex_descriptor vertex_descriptor;
- typedef typename graph_traits<Graph>::vertices_size_type vertices_size_type;
-
- typedef typename property_traits<DistanceMap>::value_type distance_type;
typedef ProcessGroup process_group_type;
@@ -1352,10 +1334,6 @@
typedef typename graph_traits<Graph>::degree_size_type degree_size_type;
typedef typename graph_traits<Graph>::edges_size_type edges_size_type;
typedef typename graph_traits<Graph>::vertex_descriptor vertex_descriptor;
- typedef typename mpl::if_c<(is_same<CentralityMap,
- dummy_property_map>::value),
- EdgeCentralityMap,
- CentralityMap>::type a_centrality_map;
typename graph_traits<Graph>::vertices_size_type V = num_vertices(g);
@@ -1472,9 +1450,6 @@
VertexIndexMap vertex_index,
Buffer sources)
{
- typedef typename property_traits<DistanceMap>::value_type distance_type;
- typedef static_property_map<distance_type> WeightMap;
-
detail::graph::brandes_unweighted_shortest_paths shortest_paths;
graph::parallel::detail::non_distributed_brandes_betweenness_centrality_impl(pg, g, centrality,
@@ -1528,7 +1503,6 @@
Buffer sources)
{
typedef typename graph_traits<Graph>::degree_size_type degree_size_type;
- typedef typename graph_traits<Graph>::vertex_descriptor vertex_descriptor;
typedef typename graph_traits<Graph>::edge_descriptor edge_descriptor;
typedef typename mpl::if_c<(is_same<CentralityMap,
dummy_property_map>::value),
@@ -1565,7 +1539,6 @@
Buffer sources)
{
typedef typename graph_traits<Graph>::degree_size_type degree_size_type;
- typedef typename graph_traits<Graph>::vertex_descriptor vertex_descriptor;
typedef typename graph_traits<Graph>::edge_descriptor edge_descriptor;
typedef typename mpl::if_c<(is_same<CentralityMap,
dummy_property_map>::value),
Modified: trunk/boost/graph/distributed/boman_et_al_graph_coloring.hpp
==============================================================================
--- trunk/boost/graph/distributed/boman_et_al_graph_coloring.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/boost/graph/distributed/boman_et_al_graph_coloring.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -123,7 +123,6 @@
process_group_type;
typedef typename process_group_type::process_id_type process_id_type;
typedef typename graph_traits<DistributedGraph>::vertex_descriptor Vertex;
- typedef typename graph_traits<DistributedGraph>::edge_descriptor Edge;
typedef typename graph_traits<DistributedGraph>::vertices_size_type
vertices_size_type;
typedef typename property_traits<ColorMap>::value_type color_type;
Modified: trunk/boost/graph/distributed/compressed_sparse_row_graph.hpp
==============================================================================
--- trunk/boost/graph/distributed/compressed_sparse_row_graph.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/boost/graph/distributed/compressed_sparse_row_graph.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -537,7 +537,6 @@
template<BOOST_DISTRIB_CSR_GRAPH_TEMPLATE_PARMS>
void synchronize(const BOOST_DISTRIB_CSR_GRAPH_TYPE& g)
{
- typedef BOOST_DISTRIB_CSR_GRAPH_TYPE graph_type;
synchronize(g.process_group());
}
Modified: trunk/boost/graph/distributed/connected_components.hpp
==============================================================================
--- trunk/boost/graph/distributed/connected_components.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/boost/graph/distributed/connected_components.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -296,14 +296,8 @@
typedef typename graph_traits<DistributedGraph>::adjacency_iterator
adjacency_iterator;
- typedef typename graph_traits<DistributedGraph>::out_edge_iterator
- out_edge_iterator;
- typedef typename graph_traits<DistributedGraph>::edge_iterator
- edge_iterator;
typedef typename graph_traits<DistributedGraph>::vertex_descriptor
vertex_descriptor;
- typedef typename graph_traits<DistributedGraph>::edge_descriptor
- edge_descriptor;
typedef typename boost::graph::parallel::process_group_type<DistributedGraph>
::type process_group_type;
Modified: trunk/boost/graph/distributed/connected_components_parallel_search.hpp
==============================================================================
--- trunk/boost/graph/distributed/connected_components_parallel_search.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/boost/graph/distributed/connected_components_parallel_search.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -290,8 +290,6 @@
typedef typename boost::graph::parallel::process_group_type<Graph>
::type process_group_type;
typedef typename process_group_type::process_id_type process_id_type;
- typedef typename property_map<Graph, vertex_owner_t>
- ::const_type vertex_owner_map;
typedef std::queue<vertex_descriptor> work_queue;
static const component_value_type max_component =
Modified: trunk/boost/graph/distributed/crauser_et_al_shortest_paths.hpp
==============================================================================
--- trunk/boost/graph/distributed/crauser_et_al_shortest_paths.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/boost/graph/distributed/crauser_et_al_shortest_paths.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -540,13 +540,6 @@
Compare compare, Combine combine, DistInf inf, DistZero zero,
DijkstraVisitor vis)
{
- typedef typename boost::graph::parallel::process_group_type<DistributedGraph>::type
- process_group_type;
- typedef typename process_group_type::process_id_type process_id_type;
- typedef typename graph_traits<DistributedGraph>::vertex_descriptor
- Vertex;
- typedef typename graph_traits<DistributedGraph>::vertices_size_type
- vertices_size_type;
#ifdef PBGL_ACCOUNTING
crauser_et_al_shortest_paths_stats.deleted_vertices.clear();
Modified: trunk/boost/graph/distributed/dehne_gotz_min_spanning_tree.hpp
==============================================================================
--- trunk/boost/graph/distributed/dehne_gotz_min_spanning_tree.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/boost/graph/distributed/dehne_gotz_min_spanning_tree.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -642,7 +642,6 @@
BOOST_STATIC_ASSERT((is_convertible<traversal_category*,
vertex_list_graph_tag*>::value));
- typedef typename graph_traits<Graph>::vertex_descriptor vertex_descriptor;
typedef typename graph_traits<Graph>::edge_descriptor edge_descriptor;
// Don't throw away cached edge weights
Modified: trunk/boost/graph/distributed/eager_dijkstra_shortest_paths.hpp
==============================================================================
--- trunk/boost/graph/distributed/eager_dijkstra_shortest_paths.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/boost/graph/distributed/eager_dijkstra_shortest_paths.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -349,13 +349,6 @@
Compare compare, Combine combine, DistInf inf, DistZero zero,
DijkstraVisitor vis)
{
- typedef typename boost::graph::parallel::process_group_type<DistributedGraph>::type
- process_group_type;
- typedef typename graph_traits<DistributedGraph>::vertex_descriptor
- Vertex;
- typedef typename graph_traits<DistributedGraph>::vertices_size_type
- vertices_size_type;
-
#ifdef PBGL_ACCOUNTING
eager_dijkstra_shortest_paths_stats.deleted_vertices.clear();
eager_dijkstra_shortest_paths_stats.lookahead = lookahead;
Modified: trunk/boost/graph/distributed/graphviz.hpp
==============================================================================
--- trunk/boost/graph/distributed/graphviz.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/boost/graph/distributed/graphviz.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -106,10 +106,8 @@
BOOST_GRAPH_ENABLE_IF_MODELS_PARM(Graph,distributed_graph_tag))
{
typedef typename graph_traits<Graph>::directed_category directed_category;
- typedef typename graph_traits<Graph>::vertices_size_type vertices_size_type;
typedef typename boost::graph::parallel::process_group_type<Graph>::type
process_group_type;
- typedef typename process_group_type::process_id_type process_id_type;
typedef typename property_map<Graph, vertex_index_t>::const_type
VertexIndexMap;
typedef typename property_map<Graph, vertex_global_t>::const_type
Modified: trunk/boost/graph/distributed/hohberg_biconnected_components.hpp
==============================================================================
--- trunk/boost/graph/distributed/hohberg_biconnected_components.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/boost/graph/distributed/hohberg_biconnected_components.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -912,7 +912,6 @@
BOOST_CONCEPT_ASSERT(( IncidenceGraphConcept<Graph> ));
typedef typename graph_traits<Graph>::edges_size_type edges_size_type;
- typedef typename graph_traits<Graph>::degree_size_type degree_size_type;
typedef typename graph_traits<Graph>::vertex_descriptor vertex_descriptor;
typedef typename graph_traits<Graph>::edge_descriptor edge_descriptor;
@@ -942,7 +941,6 @@
std::size_t path_length = 1;
typedef std::vector<vertex_descriptor> path_t;
- typedef typename path_t::iterator path_iterator;
unsigned char minimum_phase = 5;
do {
Modified: trunk/boost/graph/distributed/named_graph.hpp
==============================================================================
--- trunk/boost/graph/distributed/named_graph.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/boost/graph/distributed/named_graph.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -481,8 +481,6 @@
template<BGL_NAMED_GRAPH_PARAMS>
BGL_NAMED_GRAPH::lazy_add_edge::~lazy_add_edge()
{
- typedef typename BGL_NAMED_GRAPH::process_id_type process_id_type;
-
using boost::parallel::detail::make_untracked_pair;
/// If this edge has already been created or will be created by
@@ -679,7 +677,6 @@
template<BGL_NAMED_GRAPH_PARAMS>
BGL_NAMED_GRAPH::lazy_add_edge_with_property::~lazy_add_edge_with_property()
{
- typedef typename BGL_NAMED_GRAPH::process_id_type process_id_type;
using boost::detail::parallel::make_pair_with_property;
/// If this edge has already been created or will be created by
Modified: trunk/boost/graph/distributed/page_rank.hpp
==============================================================================
--- trunk/boost/graph/distributed/page_rank.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/boost/graph/distributed/page_rank.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -89,8 +89,6 @@
int me;
MPI_Comm_rank(MPI_COMM_WORLD, &me);
- typedef typename property_map<Graph, vertex_owner_t>
- ::const_type vertex_owner_map;
typename property_map<Graph, vertex_owner_t>::const_type
owner = get(vertex_owner, g);
(void)owner;
Modified: trunk/boost/graph/distributed/strong_components.hpp
==============================================================================
--- trunk/boost/graph/distributed/strong_components.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/boost/graph/distributed/strong_components.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -70,8 +70,6 @@
marshal_set( std::vector<std::vector<typename graph_traits<Graph>::vertex_descriptor> > in,
std::vector<typename graph_traits<Graph>::vertex_descriptor>& out )
{
- typedef typename graph_traits<Graph>::vertex_descriptor vertex_descriptor;
-
for( std::size_t i = 0; i < in.size(); ++i ) {
out.insert( out.end(), graph_traits<Graph>::null_vertex() );
out.insert( out.end(), in[i].begin(), in[i].end() );
@@ -85,7 +83,6 @@
std::vector<std::vector<typename graph_traits<Graph>::vertex_descriptor> >& out )
{
typedef typename graph_traits<Graph>::vertex_descriptor vertex_descriptor;
- typedef typename graph_traits<Graph>::vertex_iterator vertex_iterator;
while( !in.empty() ) {
typename std::vector<vertex_descriptor>::iterator end
@@ -732,8 +729,6 @@
typedef typename process_group_type::process_id_type process_id_type;
typedef std::vector<std::pair<vertex_descriptor, vertex_descriptor> > VertexPairVec;
- typedef typename graph_traits<Graph>::directed_category directed_category;
-
typename property_map<Graph, vertex_owner_t>::const_type
owner = get(vertex_owner, g);
@@ -862,7 +857,6 @@
VertexIndexMap vertex_index_map,
incidence_graph_tag)
{
- typedef typename graph_traits<Graph>::vertex_iterator vertex_iterator;
typedef typename graph_traits<Graph>::vertex_descriptor vertex_descriptor;
typedef iterator_property_map<typename std::vector<vertex_descriptor>::iterator,
VertexIndexMap> IsoMap;
Modified: trunk/boost/graph/edmonds_karp_max_flow.hpp
==============================================================================
--- trunk/boost/graph/edmonds_karp_max_flow.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/boost/graph/edmonds_karp_max_flow.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -151,7 +151,6 @@
const bgl_named_params<P, T, R>& params,
param_not_found)
{
- typedef typename graph_traits<Graph>::edge_descriptor edge_descriptor;
typedef typename graph_traits<Graph>::vertices_size_type size_type;
size_type n = is_default_param(get_param(params, vertex_color)) ?
num_vertices(g) : 1;
Modified: trunk/boost/graph/fruchterman_reingold.hpp
==============================================================================
--- trunk/boost/graph/fruchterman_reingold.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/boost/graph/fruchterman_reingold.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -282,7 +282,6 @@
Cooling cool,
DisplacementMap displacement)
{
- typedef typename Topology::point_type Point;
typedef typename graph_traits<Graph>::vertex_iterator vertex_iterator;
typedef typename graph_traits<Graph>::vertex_descriptor vertex_descriptor;
typedef typename graph_traits<Graph>::edge_iterator edge_iterator;
Modified: trunk/boost/graph/graph_utility.hpp
==============================================================================
--- trunk/boost/graph/graph_utility.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/boost/graph/graph_utility.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -237,8 +237,6 @@
template <class Graph, class Vertex>
bool is_adj_dispatch(Graph& g, Vertex a, Vertex b, bidirectional_tag)
{
- typedef typename graph_traits<Graph>::edge_descriptor
- edge_descriptor;
typename graph_traits<Graph>::adjacency_iterator vi, viend,
adj_found;
boost::tie(vi, viend) = adjacent_vertices(a, g);
@@ -265,8 +263,6 @@
template <class Graph, class Vertex>
bool is_adj_dispatch(Graph& g, Vertex a, Vertex b, directed_tag)
{
- typedef typename graph_traits<Graph>::edge_descriptor
- edge_descriptor;
typename graph_traits<Graph>::adjacency_iterator vi, viend, found;
boost::tie(vi, viend) = adjacent_vertices(a, g);
#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300 && defined(__SGI_STL_PORT)
Modified: trunk/boost/graph/gursoy_atun_layout.hpp
==============================================================================
--- trunk/boost/graph/gursoy_atun_layout.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/boost/graph/gursoy_atun_layout.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -208,9 +208,6 @@
typedef typename graph_traits<VertexListAndIncidenceGraph>::vertex_iterator
vertex_iterator;
- typedef typename graph_traits<VertexListAndIncidenceGraph>::vertex_descriptor
- vertex_descriptor;
- typedef typename Topology::point_type point_type;
vertex_iterator i, iend;
double diameter_ratio = (double)diameter_final / diameter_initial;
double learning_constant_ratio =
@@ -230,6 +227,7 @@
vertex_index_map);
for (int round = 0; round < nsteps; ++round) {
double part_done = (double)round / (nsteps - 1);
+ // fprintf(stderr, "%2d%% done\n", int(rint(part_done * 100.)));
int diameter = (int)(diameter_initial * pow(diameter_ratio, part_done));
double learning_constant =
learning_constant_initial * pow(learning_constant_ratio, part_done);
Modified: trunk/boost/graph/is_straight_line_drawing.hpp
==============================================================================
--- trunk/boost/graph/is_straight_line_drawing.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/boost/graph/is_straight_line_drawing.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -106,11 +106,8 @@
{
typedef typename graph_traits<Graph>::vertex_descriptor vertex_t;
- typedef typename graph_traits<Graph>::vertex_iterator vertex_iterator_t;
typedef typename graph_traits<Graph>::edge_descriptor edge_t;
typedef typename graph_traits<Graph>::edge_iterator edge_iterator_t;
- typedef typename graph_traits<Graph>::edges_size_type e_size_t;
- typedef typename graph_traits<Graph>::vertices_size_type v_size_t;
typedef std::size_t x_coord_t;
typedef std::size_t y_coord_t;
Modified: trunk/boost/graph/king_ordering.hpp
==============================================================================
--- trunk/boost/graph/king_ordering.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/boost/graph/king_ordering.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -37,7 +37,6 @@
typename graph_traits<Graph>::out_edge_iterator ei, ei_end;
Vertex v, w;
- typedef typename std::deque<Vertex>::iterator iterator;
typedef typename std::deque<Vertex>::reverse_iterator reverse_iterator;
reverse_iterator rend = Qptr->rend()-index_begin;
@@ -86,8 +85,6 @@
//this function replaces pop_heap, and tracks state information
template <typename Vertex>
void percolate_down(int offset){
- typedef typename std::deque<Vertex>::reverse_iterator reverse_iterator;
-
int heap_last = index_begin + offset;
int heap_first = Qptr->size() - 1;
@@ -267,7 +264,6 @@
return permutation;
typedef typename boost::graph_traits<Graph>::vertex_descriptor Vertex;
- typedef typename boost::graph_traits<Graph>::vertex_iterator VerIter;
typedef typename property_traits<ColorMap>::value_type ColorValue;
typedef color_traits<ColorValue> Color;
@@ -302,7 +298,6 @@
if (has_no_vertices(G))
return permutation;
- typedef out_degree_property_map<Graph> DegreeMap;
std::vector<default_color_type> colors(num_vertices(G));
return king_ordering(G, permutation,
make_iterator_property_map(&colors[0], index_map,
Modified: trunk/boost/graph/kruskal_min_spanning_tree.hpp
==============================================================================
--- trunk/boost/graph/kruskal_min_spanning_tree.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/boost/graph/kruskal_min_spanning_tree.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -102,7 +102,6 @@
{
typedef typename graph_traits<Graph>::vertices_size_type size_type;
typedef typename graph_traits<Graph>::vertex_descriptor vertex_t;
- typedef typename property_map<Graph, vertex_index_t>::type index_map_t;
if (num_vertices(g) == 0) return; // Nothing to do in this case
typename graph_traits<Graph>::vertices_size_type
n = num_vertices(g);
Modified: trunk/boost/graph/maximum_adjacency_search.hpp
==============================================================================
--- trunk/boost/graph/maximum_adjacency_search.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/boost/graph/maximum_adjacency_search.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -118,8 +118,6 @@
void
maximum_adjacency_search(const Graph& g, WeightMap weights, MASVisitor vis, const typename boost::graph_traits<Graph>::vertex_descriptor start, VertexAssignmentMap assignments, KeyedUpdatablePriorityQueue pq) {
typedef typename boost::graph_traits<Graph>::vertex_descriptor vertex_descriptor;
- typedef typename boost::graph_traits<Graph>::vertices_size_type vertices_size_type;
- typedef typename boost::graph_traits<Graph>::edge_descriptor edge_descriptor;
typedef typename boost::property_traits<WeightMap>::value_type weight_type;
std::set<vertex_descriptor> assignedVertices;
@@ -197,7 +195,7 @@
typedef typename boost::graph_traits<Graph>::edge_descriptor edge_descriptor;
BOOST_CONCEPT_ASSERT((boost::Convertible<typename boost::graph_traits<Graph>::directed_category, boost::undirected_tag>));
BOOST_CONCEPT_ASSERT((boost::ReadablePropertyMapConcept<WeightMap, edge_descriptor>));
- typedef typename boost::property_traits<WeightMap>::value_type weight_type;
+ // typedef typename boost::property_traits<WeightMap>::value_type weight_type;
boost::function_requires< MASVisitorConcept<MASVisitor, Graph> >();
BOOST_CONCEPT_ASSERT((boost::ReadWritePropertyMapConcept<VertexAssignmentMap, vertex_descriptor>));
BOOST_CONCEPT_ASSERT((boost::Convertible<vertex_descriptor, typename boost::property_traits<VertexAssignmentMap>::value_type>));
Modified: trunk/boost/graph/mcgregor_common_subgraphs.hpp
==============================================================================
--- trunk/boost/graph/mcgregor_common_subgraphs.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/boost/graph/mcgregor_common_subgraphs.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -121,7 +121,6 @@
VertexEquivalencePredicate vertices_equivalent,
bool only_connected_subgraphs)
{
- typedef typename graph_traits<GraphFirst>::vertex_descriptor VertexFirst;
typedef typename graph_traits<GraphSecond>::vertex_descriptor VertexSecond;
typedef typename graph_traits<GraphFirst>::edge_descriptor EdgeFirst;
Modified: trunk/boost/graph/metric_tsp_approx.hpp
==============================================================================
--- trunk/boost/graph/metric_tsp_approx.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/boost/graph/metric_tsp_approx.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -173,7 +173,6 @@
// We build a custom graph in this algorithm.
typedef adjacency_list <vecS, vecS, directedS, no_property, no_property > MSTImpl;
- typedef graph_traits<MSTImpl>::edge_descriptor Edge;
typedef graph_traits<MSTImpl>::vertex_descriptor Vertex;
typedef graph_traits<MSTImpl>::vertex_iterator VItr;
Modified: trunk/boost/graph/planar_canonical_ordering.hpp
==============================================================================
--- trunk/boost/graph/planar_canonical_ordering.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/boost/graph/planar_canonical_ordering.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -41,10 +41,8 @@
typedef typename graph_traits<Graph>::vertex_descriptor vertex_t;
typedef typename graph_traits<Graph>::edge_descriptor edge_t;
- typedef typename graph_traits<Graph>::vertex_iterator vertex_iterator_t;
typedef typename graph_traits<Graph>::adjacency_iterator
adjacency_iterator_t;
- typedef typename std::pair<vertex_t, vertex_t> vertex_pair_t;
typedef typename property_traits<PlanarEmbedding>::value_type
embedding_value_t;
typedef typename embedding_value_t::const_iterator embedding_iterator_t;
Modified: trunk/boost/graph/random.hpp
==============================================================================
--- trunk/boost/graph/random.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/boost/graph/random.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -86,8 +86,6 @@
template <typename Graph, typename WeightMap, typename RandomNumGen>
typename graph_traits<Graph>::edge_descriptor
weighted_random_out_edge(Graph& g, typename graph_traits<Graph>::vertex_descriptor src, WeightMap weight, RandomNumGen& gen) {
- typedef graph_traits<Graph> gt;
- typedef typename gt::vertex_descriptor vertex_descriptor;
typedef typename property_traits<WeightMap>::value_type weight_type;
weight_type weight_sum(0);
BGL_FORALL_OUTEDGES_T(src, e, g, Graph) {weight_sum += get(weight, e);}
Modified: trunk/boost/graph/random_spanning_tree.hpp
==============================================================================
--- trunk/boost/graph/random_spanning_tree.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/boost/graph/random_spanning_tree.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -33,7 +33,6 @@
template <typename Graph, typename PredMap, typename ColorMap, typename NextEdge>
void random_spanning_tree_internal(const Graph& g, typename graph_traits<Graph>::vertex_descriptor s, PredMap pred, ColorMap color, NextEdge next_edge) {
typedef typename graph_traits<Graph>::vertex_descriptor vertex_descriptor;
- typedef typename graph_traits<Graph>::edge_descriptor edge_descriptor;
BOOST_ASSERT (num_vertices(g) >= 1); // g must also be undirected (or symmetric) and connected
Modified: trunk/boost/graph/read_dimacs.hpp
==============================================================================
--- trunk/boost/graph/read_dimacs.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/boost/graph/read_dimacs.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -45,7 +45,6 @@
const int NODE_FIELDS = 2; /* no of fields in node line */
const int P_FIELDS = 3; /* no of fields in problem line */
- typedef typename graph_traits<Graph>::vertices_size_type vertices_size_type;
typedef typename graph_traits<Graph>::vertex_descriptor vertex_descriptor;
typedef typename graph_traits<Graph>::edge_descriptor edge_descriptor;
Modified: trunk/boost/graph/stoer_wagner_min_cut.hpp
==============================================================================
--- trunk/boost/graph/stoer_wagner_min_cut.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/boost/graph/stoer_wagner_min_cut.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -76,7 +76,6 @@
template < typename Vertex, typename Graph >
void finish_vertex(Vertex u, const Graph & g)
{
- typedef typename boost::property_traits<ParityMap>::value_type parity_type;
typedef typename boost::property_traits<InternalParityMap>::value_type internal_parity_type;
++m_visited;
@@ -131,10 +130,7 @@
typename boost::property_traits<WeightMap>::value_type
stoer_wagner_min_cut(const UndirectedGraph& g, WeightMap weights, ParityMap parities, VertexAssignmentMap assignments, KeyedUpdatablePriorityQueue& pq, IndexMap index_map) {
typedef typename boost::graph_traits<UndirectedGraph>::vertex_descriptor vertex_descriptor;
- typedef typename boost::graph_traits<UndirectedGraph>::vertices_size_type vertices_size_type;
- typedef typename boost::graph_traits<UndirectedGraph>::edge_descriptor edge_descriptor;
typedef typename boost::property_traits<WeightMap>::value_type weight_type;
- typedef typename boost::property_traits<ParityMap>::value_type parity_type;
typename graph_traits<UndirectedGraph>::vertex_iterator u_iter, u_end;
@@ -185,9 +181,9 @@
typedef typename boost::graph_traits<UndirectedGraph>::edge_descriptor edge_descriptor;
BOOST_CONCEPT_ASSERT((boost::Convertible<typename boost::graph_traits<UndirectedGraph>::directed_category, boost::undirected_tag>));
BOOST_CONCEPT_ASSERT((boost::ReadablePropertyMapConcept<WeightMap, edge_descriptor>));
- typedef typename boost::property_traits<WeightMap>::value_type weight_type;
+ // typedef typename boost::property_traits<WeightMap>::value_type weight_type;
BOOST_CONCEPT_ASSERT((boost::WritablePropertyMapConcept<ParityMap, vertex_descriptor>));
- typedef typename boost::property_traits<ParityMap>::value_type parity_type;
+ // typedef typename boost::property_traits<ParityMap>::value_type parity_type;
BOOST_CONCEPT_ASSERT((boost::ReadWritePropertyMapConcept<VertexAssignmentMap, vertex_descriptor>));
BOOST_CONCEPT_ASSERT((boost::Convertible<vertex_descriptor, typename boost::property_traits<VertexAssignmentMap>::value_type>));
BOOST_CONCEPT_ASSERT((boost::KeyedUpdatableQueueConcept<KeyedUpdatablePriorityQueue>));
Modified: trunk/boost/graph/tiernan_all_cycles.hpp
==============================================================================
--- trunk/boost/graph/tiernan_all_cycles.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/boost/graph/tiernan_all_cycles.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -212,7 +212,6 @@
{
BOOST_CONCEPT_ASSERT(( IncidenceGraphConcept<Graph> ));
typedef typename graph_traits<Graph>::vertex_descriptor Vertex;
- typedef typename graph_traits<Graph>::edge_descriptor Edge;
typedef typename graph_traits<Graph>::out_edge_iterator OutIterator;
// get the current vertex
Modified: trunk/boost/graph/transitive_closure.hpp
==============================================================================
--- trunk/boost/graph/transitive_closure.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/boost/graph/transitive_closure.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -71,7 +71,6 @@
if (num_vertices(g) == 0)
return;
typedef typename graph_traits < Graph >::vertex_descriptor vertex;
- typedef typename graph_traits < Graph >::edge_descriptor edge;
typedef typename graph_traits < Graph >::vertex_iterator vertex_iterator;
typedef typename property_traits < VertexIndexMap >::value_type size_type;
typedef typename graph_traits <
@@ -208,7 +207,6 @@
// Add vertices to the transitive closure graph
- typedef typename graph_traits < GraphTC >::vertex_descriptor tc_vertex;
{
vertex_iterator i, i_end;
for (boost::tie(i, i_end) = vertices(g); i != i_end; ++i)
@@ -306,7 +304,6 @@
template < typename G > void warshall_transitive_closure(G & g)
{
- typedef typename graph_traits < G >::vertex_descriptor vertex;
typedef typename graph_traits < G >::vertex_iterator vertex_iterator;
BOOST_CONCEPT_ASSERT(( AdjacencyMatrixConcept < G > ));
@@ -332,7 +329,6 @@
template < typename G > void warren_transitive_closure(G & g)
{
using namespace boost;
- typedef typename graph_traits < G >::vertex_descriptor vertex;
typedef typename graph_traits < G >::vertex_iterator vertex_iterator;
BOOST_CONCEPT_ASSERT(( AdjacencyMatrixConcept < G > ));
Modified: trunk/boost/graph/two_graphs_common_spanning_trees.hpp
==============================================================================
--- trunk/boost/graph/two_graphs_common_spanning_trees.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/boost/graph/two_graphs_common_spanning_trees.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -591,17 +591,11 @@
typedef typename GraphTraits::edges_size_type edges_size_type;
typedef typename GraphTraits::edge_iterator edge_iterator;
- typedef typename Seq::const_iterator seq_const_iterator;
- typedef typename Seq::difference_type seq_diff_type;
typedef typename Seq::value_type seq_value_type;
typedef typename Seq::size_type seq_size_type;
- typedef typename Seq::iterator seq_iterator;
- typedef typename Order::const_iterator order_const_iterator;
- typedef typename Order::difference_type order_diff_type;
typedef typename Order::value_type order_value_type;
typedef typename Order::size_type order_size_type;
- typedef typename Order::iterator order_iterator;
BOOST_STATIC_ASSERT((is_same<order_value_type, edge_descriptor>::value));
BOOST_CONCEPT_ASSERT((Convertible<order_size_type, edges_size_type>));
@@ -846,7 +840,6 @@
typedef graph_traits<Graph> GraphTraits;
typedef typename GraphTraits::edge_descriptor edge_descriptor;
- typedef typename GraphTraits::edges_size_type edges_size_type;
typedef typename GraphTraits::edge_iterator edge_iterator;
std::vector<edge_descriptor> iGO, vGO;
Modified: trunk/boost/graph/vf2_sub_graph_iso.hpp
==============================================================================
--- trunk/boost/graph/vf2_sub_graph_iso.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/boost/graph/vf2_sub_graph_iso.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -1014,8 +1014,6 @@
bool vf2_subgraph_iso(const GraphSmall& graph_small, const GraphLarge& graph_large,
SubGraphIsoMapCallback user_callback) {
- typedef typename graph_traits<GraphSmall>::vertex_descriptor vertex_small_type;
-
return vf2_subgraph_iso(graph_small, graph_large, user_callback,
get(vertex_index, graph_small), get(vertex_index, graph_large),
vertex_order_by_mult(graph_small),
@@ -1144,8 +1142,6 @@
bool vf2_graph_iso(const Graph1& graph1, const Graph2& graph2,
GraphIsoMapCallback user_callback) {
- typedef typename graph_traits<Graph1>::vertex_descriptor vertex1_type;
-
return vf2_graph_iso(graph1, graph2, user_callback,
get(vertex_index, graph1), get(vertex_index, graph2),
vertex_order_by_mult(graph1),
Modified: trunk/boost/graph/write_dimacs.hpp
==============================================================================
--- trunk/boost/graph/write_dimacs.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/boost/graph/write_dimacs.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -51,10 +51,6 @@
typename graph_traits<Graph>::vertex_descriptor sink,
std::ostream& out)
{
- typedef typename graph_traits<Graph>::vertex_descriptor vertex_descriptor;
- typedef typename graph_traits<Graph>::vertices_size_type vertices_size_type;
- typedef typename graph_traits<Graph>::edge_descriptor edge_descriptor;
- typedef typename graph_traits<Graph>::edges_size_type edges_size_type;
typedef typename graph_traits<Graph>::edge_iterator edge_iterator;
out << "c DIMACS max-flow file generated from boost::write_dimacs_max_flow" << std::endl;
Modified: trunk/libs/graph/example/astar-cities.cpp
==============================================================================
--- trunk/libs/graph/example/astar-cities.cpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/libs/graph/example/astar-cities.cpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -118,7 +118,6 @@
typedef property_map<mygraph_t, edge_weight_t>::type WeightMap;
typedef mygraph_t::vertex_descriptor vertex;
typedef mygraph_t::edge_descriptor edge_descriptor;
- typedef mygraph_t::vertex_iterator vertex_iterator;
typedef std::pair<int, int> edge;
// specify data
Modified: trunk/libs/graph/example/bfs-example.cpp
==============================================================================
--- trunk/libs/graph/example/bfs-example.cpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/libs/graph/example/bfs-example.cpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -54,7 +54,6 @@
#endif
// Typedefs
- typedef graph_traits < graph_t >::vertex_descriptor Vertex;
typedef graph_traits < graph_t >::vertices_size_type Size;
typedef Size* Iiter;
Modified: trunk/libs/graph/example/bfs-example2.cpp
==============================================================================
--- trunk/libs/graph/example/bfs-example2.cpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/libs/graph/example/bfs-example2.cpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -63,7 +63,6 @@
#endif
// Typedefs
- typedef graph_traits<graph_t>::vertex_descriptor Vertex;
typedef graph_traits<graph_t>::vertices_size_type Size;
typedef Size* Iiter;
Modified: trunk/libs/graph/example/dfs-example.cpp
==============================================================================
--- trunk/libs/graph/example/dfs-example.cpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/libs/graph/example/dfs-example.cpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -59,7 +59,6 @@
#endif
// Typedefs
- typedef boost::graph_traits < graph_t >::vertex_descriptor Vertex;
typedef size_type* Iiter;
// discover time and finish time properties
Modified: trunk/libs/graph/example/dijkstra-example-listS.cpp
==============================================================================
--- trunk/libs/graph/example/dijkstra-example-listS.cpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/libs/graph/example/dijkstra-example-listS.cpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -26,7 +26,6 @@
property<vertex_distance_t, int,
property<vertex_predecessor_t, vertex_descriptor> > > >,
property<edge_weight_t, int> > graph_t;
- typedef graph_traits<graph_t>::edge_descriptor edge_descriptor;
typedef std::pair<int, int> Edge;
const int num_nodes = 5;
Modified: trunk/libs/graph/example/dijkstra-example.cpp
==============================================================================
--- trunk/libs/graph/example/dijkstra-example.cpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/libs/graph/example/dijkstra-example.cpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -22,7 +22,6 @@
typedef adjacency_list < listS, vecS, directedS,
no_property, property < edge_weight_t, int > > graph_t;
typedef graph_traits < graph_t >::vertex_descriptor vertex_descriptor;
- typedef graph_traits < graph_t >::edge_descriptor edge_descriptor;
typedef std::pair<int, int> Edge;
const int num_nodes = 5;
Modified: trunk/libs/graph/example/dijkstra-no-color-map-example.cpp
==============================================================================
--- trunk/libs/graph/example/dijkstra-no-color-map-example.cpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/libs/graph/example/dijkstra-no-color-map-example.cpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -26,7 +26,6 @@
typedef adjacency_list < listS, vecS, directedS,
no_property, property < edge_weight_t, int > > graph_t;
typedef graph_traits < graph_t >::vertex_descriptor vertex_descriptor;
- typedef graph_traits < graph_t >::edge_descriptor edge_descriptor;
typedef std::pair<int, int> Edge;
const int num_nodes = 5;
Modified: trunk/libs/graph/example/mcgregor_subgraphs_example.cpp
==============================================================================
--- trunk/libs/graph/example/mcgregor_subgraphs_example.cpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/libs/graph/example/mcgregor_subgraphs_example.cpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -76,11 +76,7 @@
property<vertex_index_t, unsigned int> >,
property<edge_name_t, unsigned int> > Graph;
- typedef graph_traits<Graph>::vertex_descriptor Vertex;
- typedef graph_traits<Graph>::edge_descriptor Edge;
-
typedef property_map<Graph, vertex_name_t>::type VertexNameMap;
- typedef property_map<Graph, edge_name_t>::type EdgeNameMap;
// Test maximum and unique variants on known graphs
Graph graph_simple1, graph_simple2;
Modified: trunk/libs/graph/example/stoer_wagner.cpp
==============================================================================
--- trunk/libs/graph/example/stoer_wagner.cpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/libs/graph/example/stoer_wagner.cpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -27,7 +27,6 @@
typedef boost::adjacency_list<boost::vecS, boost::vecS, boost::undirectedS,
boost::no_property, boost::property<boost::edge_weight_t, int> > undirected_graph;
- typedef boost::graph_traits<undirected_graph>::vertex_descriptor vertex_descriptor;
typedef boost::property_map<undirected_graph, boost::edge_weight_t>::type weight_map_type;
typedef boost::property_traits<weight_map_type>::value_type weight_type;
Modified: trunk/libs/graph/example/subgraph.cpp
==============================================================================
--- trunk/libs/graph/example/subgraph.cpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/libs/graph/example/subgraph.cpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -41,7 +41,6 @@
int main(int,char*[])
{
using namespace boost;
- typedef adjacency_list_traits<vecS, vecS, directedS> Traits;
typedef subgraph< adjacency_list<vecS, vecS, directedS,
property<vertex_color_t, int>, property<edge_index_t, int> > > Graph;
Modified: trunk/libs/graph/test/adj_list_loops.cpp
==============================================================================
--- trunk/libs/graph/test/adj_list_loops.cpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/libs/graph/test/adj_list_loops.cpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -17,7 +17,6 @@
void test_graph_nonloop()
{
typedef typename graph_traits<Graph>::vertex_descriptor Vertex;
- typedef typename graph_traits<Graph>::edge_descriptor Edge;
// Build a graph with 1 edge and turn it into a loop.
Graph g(5);
@@ -36,7 +35,6 @@
void test_multigraph_nonloop()
{
typedef typename graph_traits<Graph>::vertex_descriptor Vertex;
- typedef typename graph_traits<Graph>::edge_descriptor Edge;
// Build a graph with 1 edge and turn it into a loop.
Graph g(5);
@@ -55,7 +53,6 @@
void test_graph_loop()
{
typedef typename graph_traits<Graph>::vertex_descriptor Vertex;
- typedef typename graph_traits<Graph>::edge_descriptor Edge;
Graph g(5);
Vertex v = *next(vertices(g).first, 2);
@@ -70,7 +67,6 @@
void test_multigraph_loop()
{
typedef typename graph_traits<Graph>::vertex_descriptor Vertex;
- typedef typename graph_traits<Graph>::edge_descriptor Edge;
Graph g(5);
Vertex v = *next(vertices(g).first, 2);
Modified: trunk/libs/graph/test/all_planar_input_files_test.cpp
==============================================================================
--- trunk/libs/graph/test/all_planar_input_files_test.cpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/libs/graph/test/all_planar_input_files_test.cpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -122,9 +122,7 @@
typedef graph_traits<graph>::edge_iterator edge_iterator_t;
typedef graph_traits<graph>::vertex_iterator vertex_iterator_t;
typedef graph_traits<graph>::edges_size_type e_size_t;
- typedef graph_traits<graph>::vertices_size_type v_size_t;
typedef graph_traits<graph>::vertex_descriptor vertex_t;
- typedef std::pair<vertex_t, vertex_t> vertex_pair_t;
typedef edge_index_update_visitor<property_map<graph, edge_index_t>::type>
edge_visitor_t;
Modified: trunk/libs/graph/test/astar_search_test.cpp
==============================================================================
--- trunk/libs/graph/test/astar_search_test.cpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/libs/graph/test/astar_search_test.cpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -122,7 +122,6 @@
typedef property_map<mygraph_t, edge_weight_t>::type WeightMap;
typedef mygraph_t::vertex_descriptor vertex;
typedef mygraph_t::edge_descriptor edge_descriptor;
- typedef mygraph_t::vertex_iterator vertex_iterator;
typedef std::pair<int, int> edge;
// specify data
Modified: trunk/libs/graph/test/closeness_centrality.cpp
==============================================================================
--- trunk/libs/graph/test/closeness_centrality.cpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/libs/graph/test/closeness_centrality.cpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -31,8 +31,6 @@
void build_graph(Graph& g,
typename vertex_vector<Graph>::type& v)
{
- typedef typename graph_traits<Graph>::vertex_descriptor Vertex;
-
// add vertices
for(size_t i = 0; i < N; ++i) {
v[i] = add_vertex(g);
Modified: trunk/libs/graph/test/clustering_coefficient.cpp
==============================================================================
--- trunk/libs/graph/test/clustering_coefficient.cpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/libs/graph/test/clustering_coefficient.cpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -27,8 +27,6 @@
template <typename Graph>
void build_graph(Graph& g, typename vertex_vector<Graph>::type& v)
{
- typedef typename graph_traits<Graph>::vertex_descriptor Vertex;
-
// add vertices
for(size_t i = 0; i < N; ++i) {
v[i] = add_vertex(g);
@@ -98,7 +96,7 @@
main(int, char *[])
{
typedef undirected_graph<> Graph;
- typedef directed_graph<> Digraph;
+ // typedef directed_graph<> Digraph;
// TODO: write a test for directed clustering coefficient.
Modified: trunk/libs/graph/test/cycle_ratio_tests.cpp
==============================================================================
--- trunk/libs/graph/test/cycle_ratio_tests.cpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/libs/graph/test/cycle_ratio_tests.cpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -331,7 +331,6 @@
{
GraphMInt gm(10);
typedef graph_traits<GraphMInt>::vertex_iterator VertexItM;
- typedef graph_traits<GraphMInt>::edge_descriptor EdgeM;
VertexItM vi1, vi2, vi_end;
for (boost::tie(vi1, vi_end) = vertices(gm); vi1 != vi_end; ++vi1)
{
Modified: trunk/libs/graph/test/degree_centrality.cpp
==============================================================================
--- trunk/libs/graph/test/degree_centrality.cpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/libs/graph/test/degree_centrality.cpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -22,8 +22,6 @@
void build_graph(Graph& g,
vector<typename graph_traits<Graph>::vertex_descriptor>& v)
{
- typedef typename graph_traits<Graph>::vertex_descriptor Vertex;
-
// add vertices
for(size_t i = 0; i < N; ++i) {
v[i] = add_vertex(g);
Modified: trunk/libs/graph/test/dijkstra_no_color_map_compare.cpp
==============================================================================
--- trunk/libs/graph/test/dijkstra_no_color_map_compare.cpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/libs/graph/test/dijkstra_no_color_map_compare.cpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -94,9 +94,6 @@
property<vertex_index_t, int >,
property<edge_weight_t, double> > graph_t;
- typedef graph_traits<graph_t>::vertex_descriptor vertex_t;
- typedef graph_traits<graph_t>::edge_descriptor edge_t;
-
graph_t graph;
generate_random_graph(graph, vertices_to_create, edges_to_create, generator);
Modified: trunk/libs/graph/test/eccentricity.cpp
==============================================================================
--- trunk/libs/graph/test/eccentricity.cpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/libs/graph/test/eccentricity.cpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -31,8 +31,6 @@
void build_graph(Graph& g,
typename vertex_vector<Graph>::type& v)
{
- typedef typename graph_traits<Graph>::vertex_descriptor Vertex;
-
// add vertices
for(size_t i = 0; i < N; ++i) {
v[i] = add_vertex(g);
Modified: trunk/libs/graph/test/graphviz_test.cpp
==============================================================================
--- trunk/libs/graph/test/graphviz_test.cpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/libs/graph/test/graphviz_test.cpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -75,9 +75,6 @@
MassMap mass,
WeightMap weight) {
- typedef typename graph_traits < graph_t >::edge_descriptor edge_t;
- typedef typename graph_traits < graph_t >::vertex_descriptor vertex_t;
-
// Construct a graph and set up the dynamic_property_maps.
dynamic_properties dp(ignore_other_properties);
dp.property(node_id,name);
Modified: trunk/libs/graph/test/index_graph.cpp
==============================================================================
--- trunk/libs/graph/test/index_graph.cpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/libs/graph/test/index_graph.cpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -64,7 +64,6 @@
template <typename Graph>
void build()
{
- typedef typename graph_traits<Graph>::vertex_descriptor Vertex;
typedef typename graph_traits<Graph>::vertex_iterator Iterator;
typedef typename property_map<Graph, vertex_index_t>::type IndexMap;
Modified: trunk/libs/graph/test/layout_test.cpp
==============================================================================
--- trunk/libs/graph/test/layout_test.cpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/libs/graph/test/layout_test.cpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -78,10 +78,8 @@
void
test_circle_layout(Graph*, typename graph_traits<Graph>::vertices_size_type n)
{
- typedef typename graph_traits<Graph>::vertex_descriptor vertex;
typedef typename graph_traits<Graph>::vertex_iterator vertex_iterator;
typedef typename graph_traits<Graph>::vertices_size_type vertices_size_type;
- typedef typename graph_traits<Graph>::edges_size_type edges_size_type;
Graph g(n);
Modified: trunk/libs/graph/test/matching_test.cpp
==============================================================================
--- trunk/libs/graph/test/matching_test.cpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/libs/graph/test/matching_test.cpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -131,7 +131,6 @@
typedef vector_property_map< typename graph_traits<Graph>::vertex_descriptor, vertex_index_map_t > mate_t;
typedef typename graph_traits<Graph>::vertex_iterator vertex_iterator_t;
typedef typename graph_traits<Graph>::vertex_descriptor vertex_descriptor_t;
- typedef typename graph_traits<Graph>::vertices_size_type v_size_t;
const std::size_t double_num_v = num_v * 2;
Modified: trunk/libs/graph/test/mcgregor_subgraphs_test.cpp
==============================================================================
--- trunk/libs/graph/test/mcgregor_subgraphs_test.cpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/libs/graph/test/mcgregor_subgraphs_test.cpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -195,10 +195,6 @@
typedef typename boost::graph_traits<Graph>::vertex_descriptor Vertex;
- typedef typename boost::property_map<Graph, boost::vertex_index_t>::type VertexIndexMap;
- typedef typename boost::property_map<Graph, boost::vertex_name_t>::type VertexNameMap;
- typedef typename boost::property_map<Graph, boost::edge_name_t>::type EdgeNameMap;
-
std::stringstream subgraph_string;
BGL_FORALL_VERTICES_T(vertex1, m_graph1, Graph) {
@@ -308,9 +304,6 @@
boost::property<boost::vertex_index_t, unsigned int> >,
boost::property<boost::edge_name_t, unsigned int> > Graph;
- typedef boost::graph_traits<Graph>::vertex_descriptor Vertex;
- typedef boost::graph_traits<Graph>::edge_descriptor Edge;
-
typedef boost::property_map<Graph, boost::vertex_name_t>::type VertexNameMap;
typedef boost::property_map<Graph, boost::edge_name_t>::type EdgeNameMap;
Modified: trunk/libs/graph/test/mean_geodesic.cpp
==============================================================================
--- trunk/libs/graph/test/mean_geodesic.cpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/libs/graph/test/mean_geodesic.cpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -31,8 +31,6 @@
template <typename Graph>
void build_graph(Graph& g, typename vertex_vector<Graph>::type& v)
{
- typedef typename graph_traits<Graph>::vertex_descriptor Vertex;
-
// add vertices
for(size_t i = 0; i < N; ++i) {
v[i] = add_vertex(g);
Modified: trunk/libs/graph/test/metric_tsp_approx.cpp
==============================================================================
--- trunk/libs/graph/test/metric_tsp_approx.cpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/libs/graph/test/metric_tsp_approx.cpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -86,7 +86,6 @@
property <edge_weight_t, double,
property<edge_index_t, int> > > Graph;
typedef graph_traits<Graph>::vertex_descriptor Vertex;
- typedef graph_traits <Graph>::edge_descriptor Edge;
typedef property_map<Graph, edge_weight_t>::type WeightMap;
typedef set<simple_point<double>, cmpPnt<double> > PointSet;
typedef vector< Vertex > Container;
@@ -199,7 +198,6 @@
typedef adjacency_matrix<undirectedS, no_property,
property <edge_weight_t, double> > Graph;
typedef graph_traits<Graph>::vertex_descriptor Vertex;
- typedef graph_traits <Graph>::edge_descriptor Edge;
typedef vector<Vertex> Container;
typedef property_map<Graph, edge_weight_t>::type WeightMap;
typedef property_map<Graph, vertex_index_t>::type VertexMap;
Modified: trunk/libs/graph/test/parallel_edges_loops_test.cpp
==============================================================================
--- trunk/libs/graph/test/parallel_edges_loops_test.cpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/libs/graph/test/parallel_edges_loops_test.cpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -195,9 +195,7 @@
typedef graph_traits<graph>::edge_iterator edge_iterator_t;
typedef graph_traits<graph>::vertex_iterator vertex_iterator_t;
typedef graph_traits<graph>::edges_size_type e_size_t;
- typedef graph_traits<graph>::vertices_size_type v_size_t;
typedef graph_traits<graph>::vertex_descriptor vertex_t;
- typedef std::pair<vertex_t, vertex_t> vertex_pair_t;
typedef edge_index_update_visitor<property_map<graph, edge_index_t>::type>
edge_visitor_t;
Modified: trunk/libs/graph/test/property_iter.cpp
==============================================================================
--- trunk/libs/graph/test/property_iter.cpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/libs/graph/test/property_iter.cpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -109,19 +109,9 @@
++E;
}
- typedef boost::graph_property_iter_range< Graph, vertex_id_t>::const_iterator TNodeConstIterator;
- typedef boost::graph_property_iter_range< Graph, vertex_id_t>::const_type TNodeConstIteratorType;
-
typedef boost::graph_property_iter_range< Graph, vertex_id_t>::iterator TNodeIterator;
- typedef boost::graph_property_iter_range< Graph, vertex_id_t>::type TNodeIteratorType;
-
- typedef boost::graph_property_iter_range< Graph, edge_id_t>::const_iterator TLinkConstIterator;
- typedef boost::graph_property_iter_range< Graph, edge_id_t>::const_type TLinkConstIteratorType;
typedef boost::graph_property_iter_range< Graph, edge_id_t>::iterator TLinkIterator;
- typedef boost::graph_property_iter_range< Graph, edge_id_t>::type TLinkIteratorType;
-
- typedef std::pair<TLinkConstIterator, TLinkConstIterator> tLinkConstIteratorPair;
TLinkIterator itEdgeBegin, itEdgeEnd;
Modified: trunk/libs/graph/test/sequential_vertex_coloring.cpp
==============================================================================
--- trunk/libs/graph/test/sequential_vertex_coloring.cpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/libs/graph/test/sequential_vertex_coloring.cpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -16,7 +16,6 @@
int test_main(int, char*[])
{
typedef adjacency_list<listS, vecS, undirectedS> Graph;
- typedef graph_traits<Graph>::vertex_descriptor vertex_descriptor;
typedef graph_traits<Graph>::vertices_size_type vertices_size_type;
typedef property_map<Graph, vertex_index_t>::const_type vertex_index_map;
Modified: trunk/libs/graph/test/stoer_wagner_test.cpp
==============================================================================
--- trunk/libs/graph/test/stoer_wagner_test.cpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/libs/graph/test/stoer_wagner_test.cpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -45,9 +45,6 @@
// the example from Stoer & Wagner (1997)
BOOST_AUTO_TEST_CASE(test0)
{
- typedef boost::graph_traits<undirected_graph>::vertex_descriptor vertex_descriptor;
- typedef boost::graph_traits<undirected_graph>::edge_descriptor edge_descriptor;
-
edge_t edges[] = {{0, 1}, {1, 2}, {2, 3},
{0, 4}, {1, 4}, {1, 5}, {2, 6}, {3, 6}, {3, 7}, {4, 5}, {5, 6}, {6, 7}};
weight_type ws[] = {2, 3, 4, 3, 2, 2, 2, 2, 2, 3, 1, 3};
@@ -72,16 +69,12 @@
BOOST_AUTO_TEST_CASE(test1)
{
{ // if only one vertex, can't run `boost::stoer_wagner_min_cut`
- typedef boost::graph_traits<undirected_graph>::vertex_descriptor vertex_descriptor;
- typedef boost::graph_traits<undirected_graph>::edge_descriptor edge_descriptor;
-
undirected_graph g;
add_vertex(g);
BOOST_CHECK_THROW(boost::stoer_wagner_min_cut(g, get(boost::edge_weight, g)), boost::bad_graph);
}{ // three vertices with one multi-edge
typedef boost::graph_traits<undirected_graph>::vertex_descriptor vertex_descriptor;
- typedef boost::graph_traits<undirected_graph>::edge_descriptor edge_descriptor;
edge_t edges[] = {{0, 1}, {1, 2}, {1, 2}, {2, 0}};
weight_type ws[] = {3, 1, 1, 1};
@@ -104,9 +97,6 @@
// example by Daniel Trebbien
BOOST_AUTO_TEST_CASE(test2)
{
- typedef boost::graph_traits<undirected_graph>::vertex_descriptor vertex_descriptor;
- typedef boost::graph_traits<undirected_graph>::edge_descriptor edge_descriptor;
-
edge_t edges[] = {{5, 2}, {0, 6}, {5, 6},
{3, 1}, {0, 1}, {6, 3}, {4, 6}, {2, 4}, {5, 3}};
weight_type ws[] = {1, 3, 4, 6, 4, 1, 2, 5, 2};
@@ -129,9 +119,6 @@
// example by Daniel Trebbien
BOOST_AUTO_TEST_CASE(test3)
{
- typedef boost::graph_traits<undirected_graph>::vertex_descriptor vertex_descriptor;
- typedef boost::graph_traits<undirected_graph>::edge_descriptor edge_descriptor;
-
edge_t edges[] = {{3, 4}, {3, 6}, {3, 5}, {0, 4}, {0, 1}, {0, 6}, {0, 7},
{0, 5}, {0, 2}, {4, 1}, {1, 6}, {1, 5}, {6, 7}, {7, 5}, {5, 2}, {3, 4}};
weight_type ws[] = {0, 3, 1, 3, 1, 2, 6, 1, 8, 1, 1, 80, 2, 1, 1, 4};
@@ -196,7 +183,6 @@
BOOST_AUTO_TEST_CASE(test_prgen_20_70_2)
{
typedef boost::graph_traits<undirected_graph>::vertex_descriptor vertex_descriptor;
- typedef boost::graph_traits<undirected_graph>::edge_descriptor edge_descriptor;
std::ifstream ifs((test_dir + "/prgen_input_graphs/prgen_20_70_2.net").c_str());
undirected_graph g;
@@ -221,7 +207,6 @@
BOOST_AUTO_TEST_CASE(test_prgen_50_40_2)
{
typedef boost::graph_traits<undirected_graph>::vertex_descriptor vertex_descriptor;
- typedef boost::graph_traits<undirected_graph>::edge_descriptor edge_descriptor;
std::ifstream ifs((test_dir + "/prgen_input_graphs/prgen_50_40_2.net").c_str());
undirected_graph g;
@@ -239,7 +224,6 @@
BOOST_AUTO_TEST_CASE(test_prgen_50_70_2)
{
typedef boost::graph_traits<undirected_graph>::vertex_descriptor vertex_descriptor;
- typedef boost::graph_traits<undirected_graph>::edge_descriptor edge_descriptor;
std::ifstream ifs((test_dir + "/prgen_input_graphs/prgen_50_70_2.net").c_str());
undirected_graph g;
Modified: trunk/libs/graph/test/subgraph.cpp
==============================================================================
--- trunk/libs/graph/test/subgraph.cpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/libs/graph/test/subgraph.cpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -27,7 +27,6 @@
> graph_t;
typedef subgraph<graph_t> subgraph_t;
typedef graph_traits<subgraph_t>::vertex_descriptor vertex_t;
- typedef graph_traits<subgraph_t>::edge_descriptor edge_t;
mt19937 gen;
for (int t = 0; t < 100; t += 5) {
Modified: trunk/libs/graph/test/test_properties.hpp
==============================================================================
--- trunk/libs/graph/test/test_properties.hpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/libs/graph/test/test_properties.hpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -17,9 +17,6 @@
using namespace boost;
std::cout << "...test_graph_bundle\n";
- typedef typename graph_property_type<Graph>::type Property;
- typedef typename graph_bundle_type<Graph>::type Bundle;
-
GraphBundle& b1 = g[graph_bundle];
GraphBundle& b2 = get_property(g);
ignore(b1); ignore(b2);
Modified: trunk/libs/graph/test/tiernan_all_cycles.cpp
==============================================================================
--- trunk/libs/graph/test/tiernan_all_cycles.cpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/libs/graph/test/tiernan_all_cycles.cpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -27,8 +27,6 @@
void cycle(const Path& p, const Graph& g)
{
++cycles;
- typedef typename graph_traits<Graph>::vertex_descriptor Vertex;
- typedef typename graph_traits<Graph>::edge_descriptor Edge;
// Check to make sure that each of the vertices in the path
// is truly connected and that the back is connected to the
// front - it's not validating that we find all paths, just
Modified: trunk/libs/graph_parallel/test/adjlist_redist_test.cpp
==============================================================================
--- trunk/libs/graph_parallel/test/adjlist_redist_test.cpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/libs/graph_parallel/test/adjlist_redist_test.cpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -107,7 +107,6 @@
template<typename Graph>
void test_redistribution(int n, double p, int iterations, bool debug_output)
{
- typedef typename graph_traits<Graph>::edge_descriptor edge_descriptor;
RandomGenerator gen;
Graph g(erdos_renyi_iterator<RandomGenerator, Graph>(gen, n, p),
erdos_renyi_iterator<RandomGenerator, Graph>(),
Modified: trunk/libs/graph_parallel/test/adjlist_remove_test.cpp
==============================================================================
--- trunk/libs/graph_parallel/test/adjlist_remove_test.cpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/libs/graph_parallel/test/adjlist_remove_test.cpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -34,7 +34,6 @@
typedef adjacency_list<listS, distributedS<mpi_process_group, vecS>,
bidirectionalS> Graph;
typedef graph_traits<Graph>::vertex_descriptor Vertex;
- typedef graph_traits<Graph>::edge_descriptor Edge;
typedef std::pair<std::size_t, std::size_t> E;
E edges[3] = { E(0,3), E(1,4), E(2,5) };
Modified: trunk/libs/graph_parallel/test/distributed_betweenness_centrality_test.cpp
==============================================================================
--- trunk/libs/graph_parallel/test/distributed_betweenness_centrality_test.cpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/libs/graph_parallel/test/distributed_betweenness_centrality_test.cpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -131,9 +131,6 @@
typedef sorted_erdos_renyi_iterator<minstd_rand, Graph> ERIter;
- typedef graph_traits<Graph>::vertex_descriptor vertex_descriptor;
- typedef graph_traits<Graph>::edge_descriptor edge_descriptor;
-
int n = 100;
double prob = 0.1;
int C = 3;
Modified: trunk/libs/graph_parallel/test/distributed_connected_components_test.cpp
==============================================================================
--- trunk/libs/graph_parallel/test/distributed_connected_components_test.cpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/libs/graph_parallel/test/distributed_connected_components_test.cpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -72,11 +72,6 @@
typedef compressed_sparse_row_graph<directedS, no_property, no_property, no_property,
distributedS<mpi_process_group> > Graph;
- typedef graph_traits<Graph>::vertex_descriptor vertex_descriptor;
- typedef graph_traits<Graph>::vertex_iterator vertex_iterator;
- typedef iterator_property_map<std::vector<vertex_descriptor>::iterator, property_map<Graph, vertex_index_t>::type> ParentMap;
- typedef std::pair<int, int> Edge;
-
minstd_rand gen;
gen.seed(seed);
Modified: trunk/libs/graph_parallel/test/distributed_csr_algorithm_test.cpp
==============================================================================
--- trunk/libs/graph_parallel/test/distributed_csr_algorithm_test.cpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/libs/graph_parallel/test/distributed_csr_algorithm_test.cpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -224,7 +224,6 @@
typedef small_world_iterator<minstd_rand, Digraph> SWIter;
typedef sorted_rmat_iterator<minstd_rand, Digraph> RMATIter;
- typedef graph_traits<Digraph>::vertex_descriptor vertex_descriptor;
typedef graph_traits<Digraph>::edge_descriptor edge_descriptor;
int n = 40;
Modified: trunk/libs/graph_parallel/test/distributed_dfs_test.cpp
==============================================================================
--- trunk/libs/graph_parallel/test/distributed_dfs_test.cpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/libs/graph_parallel/test/distributed_dfs_test.cpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -118,7 +118,6 @@
// Vertex properties
property<vertex_color_t, default_color_type> >
Graph;
- typedef graph_traits<Graph>::vertices_size_type size_type;
typedef graph_traits<Graph>::vertex_descriptor vertex_descriptor;
// Specify the edges in the graph
Modified: trunk/libs/graph_parallel/test/distributed_graph_coloring_test.cpp
==============================================================================
--- trunk/libs/graph_parallel/test/distributed_graph_coloring_test.cpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/libs/graph_parallel/test/distributed_graph_coloring_test.cpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -42,8 +42,6 @@
distributedS<mpi_process_group, vecS>,
undirectedS> Graph;
- typedef graph_traits<Graph>::vertex_descriptor vertex_descriptor;
- typedef graph_traits<Graph>::vertex_iterator vertex_iterator;
typedef property_map<Graph, vertex_index_t>::type vertex_index_map;
// Build a random number generator
Modified: trunk/libs/graph_parallel/test/distributed_mst_test.cpp
==============================================================================
--- trunk/libs/graph_parallel/test/distributed_mst_test.cpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/libs/graph_parallel/test/distributed_mst_test.cpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -65,8 +65,6 @@
// Edge properties
property<edge_weight_t, int> > Graph;
- typedef graph_traits<Graph>::vertex_descriptor vertex_descriptor;
- typedef graph_traits<Graph>::vertex_iterator vertex_iterator;
typedef graph_traits<Graph>::edge_descriptor edge_descriptor;
typedef std::pair<int, int> E;
Modified: trunk/libs/graph_parallel/test/distributed_shortest_paths_test.cpp
==============================================================================
--- trunk/libs/graph_parallel/test/distributed_shortest_paths_test.cpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/libs/graph_parallel/test/distributed_shortest_paths_test.cpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -169,10 +169,7 @@
VertexProperties,
WeightedEdge> Graph;
- typedef graph_traits<Graph>::vertex_descriptor vertex_descriptor;
- typedef graph_traits<Graph>::vertex_iterator vertex_iterator;
typedef graph_traits<Graph>::vertices_size_type vertices_size_type;
- typedef property_map<Graph, vertex_index_t>::type vertex_index_map;
// Build a random number generator
minstd_rand gen;
Modified: trunk/libs/graph_parallel/test/distributed_st_connected_test.cpp
==============================================================================
--- trunk/libs/graph_parallel/test/distributed_st_connected_test.cpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/libs/graph_parallel/test/distributed_st_connected_test.cpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -48,8 +48,6 @@
// Vertex properties
property<vertex_color_t, default_color_type> >
Graph;
- typedef graph_traits<Graph>::vertices_size_type size_type;
- typedef graph_traits<Graph>::vertex_descriptor vertex_descriptor;
// Specify the edges in the graph
{
Modified: trunk/libs/graph_parallel/test/distributed_strong_components_test.cpp
==============================================================================
--- trunk/libs/graph_parallel/test/distributed_strong_components_test.cpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/libs/graph_parallel/test/distributed_strong_components_test.cpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -75,11 +75,6 @@
bidirectionalS > Graph;
#endif
- typedef graph_traits<Graph>::vertex_descriptor vertex_descriptor;
- typedef graph_traits<Graph>::vertex_iterator vertex_iterator;
- typedef iterator_property_map<std::vector<vertex_descriptor>::iterator, property_map<Graph, vertex_index_t>::type> ParentMap;
- typedef std::pair<int, int> Edge;
-
minstd_rand gen;
gen.seed(seed);
Modified: trunk/libs/property_map/test/property_map_cc.cpp
==============================================================================
--- trunk/libs/property_map/test/property_map_cc.cpp Mon Aug 12 12:06:59 2013 (r85322)
+++ trunk/libs/property_map/test/property_map_cc.cpp 2013-08-12 14:14:58 EDT (Mon, 12 Aug 2013) (r85323)
@@ -107,7 +107,6 @@
{
typedef sgi_assignable_archetype<> Key; // ?
typedef sgi_assignable_archetype<> Value;
- typedef random_access_iterator_archetype<Value> Iterator;
typedef readable_property_map_archetype<Key, std::ptrdiff_t> IndexMap;
typedef shared_array_property_map<Value, IndexMap> PMap;
function_requires<Mutable_LvaluePropertyMapConcept<PMap, Key> >();
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk