From: adam4130 Date: Thu, 16 May 2019 02:49:29 +0000 (-0600) Subject: Updated boost::unordered_map/set to std library X-Git-Tag: v9.2.0-rc1~1477^2~1 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9a77c9720946294024ee108da845ad846abc8b9;p=dealii.git Updated boost::unordered_map/set to std library --- diff --git a/include/deal.II/base/graph_coloring.h b/include/deal.II/base/graph_coloring.h index 22e1d0cba9..1e534aebb0 100644 --- a/include/deal.II/base/graph_coloring.h +++ b/include/deal.II/base/graph_coloring.h @@ -24,13 +24,11 @@ # include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS -# include -# include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS # include # include +# include +# include # include @@ -121,7 +119,7 @@ namespace GraphColoring unsigned int n_iterators = 0; // Create a map from conflict indices to iterators - boost::unordered_map> + std::unordered_map> indices_to_iterators; for (Iterator it = begin; it != end; ++it) { @@ -273,7 +271,7 @@ namespace GraphColoring } // Color the graph. - std::vector> colors_used; + std::vector> colors_used; for (unsigned int i = 0; i < partition_size; ++i) { const unsigned int current_vertex(sorted_vertices[i]); @@ -306,7 +304,7 @@ namespace GraphColoring { partition_coloring.push_back( std::vector(1, partition[current_vertex])); - boost::unordered_set tmp; + std::unordered_set tmp; tmp.insert(current_vertex); colors_used.push_back(tmp); } @@ -363,7 +361,7 @@ namespace GraphColoring { if (i != i_color) { - boost::unordered_set used_k; + std::unordered_set used_k; for (unsigned int j = 0; j < colors_counter[i].size(); ++j) { // Find the color in the current partition with the largest @@ -418,7 +416,7 @@ namespace GraphColoring { if (i != i_color) { - boost::unordered_set used_k; + std::unordered_set used_k; for (unsigned int j = 0; j < colors_counter[i].size(); ++j) { // Find the color in the current partition with the