From: heister Date: Mon, 13 Aug 2012 14:34:35 +0000 (+0000) Subject: rename another types:: namespace to avoid name clash X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0fa6de33d192ec18cba952a51c558b27abb018e;p=dealii-svn.git rename another types:: namespace to avoid name clash git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_3@25940 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/source/dofs/dof_renumbering.cc b/deal.II/source/dofs/dof_renumbering.cc index 498a1d1592..fad2b36a3a 100644 --- a/deal.II/source/dofs/dof_renumbering.cc +++ b/deal.II/source/dofs/dof_renumbering.cc @@ -15,6 +15,7 @@ #include #include #include +#include #include #include @@ -128,7 +129,7 @@ namespace DoFRenumbering namespace boost { #ifndef DEAL_II_BOOST_GRAPH_COMPILER_BUG - namespace types + namespace boosttypes { using namespace ::boost; using namespace std; @@ -148,8 +149,8 @@ namespace DoFRenumbering template void create_graph (const DH &dof_handler, const bool use_constraints, - types::Graph &graph, - types::property_map::type &graph_degree) + boosttypes::Graph &graph, + boosttypes::property_map::type &graph_degree) { { // create intermediate sparsity pattern @@ -169,7 +170,7 @@ namespace DoFRenumbering add_edge (row, csp.column_number (row, col), graph); } - types::graph_traits::vertex_iterator ui, ui_end; + boosttypes::graph_traits::vertex_iterator ui, ui_end; graph_degree = get(::boost::vertex_degree, graph); for (::boost::tie(ui, ui_end) = vertices(graph); ui != ui_end; ++ui) @@ -214,18 +215,18 @@ namespace DoFRenumbering "compiler error and has been disabled. If you need to use the " "function, you need to upgrade to a newer version of the compiler.")); #else - types::Graph + boosttypes::Graph graph(dof_handler.n_dofs()); - types::property_map::type + boosttypes::property_map::type graph_degree; internal::create_graph (dof_handler, use_constraints, graph, graph_degree); - types::property_map::type + boosttypes::property_map::type index_map = get(::boost::vertex_index, graph); - std::vector inv_perm(num_vertices(graph)); + std::vector inv_perm(num_vertices(graph)); if (reversed_numbering == false) ::boost::cuthill_mckee_ordering(graph, inv_perm.rbegin(), @@ -236,7 +237,7 @@ namespace DoFRenumbering get(::boost::vertex_color, graph), make_degree_map(graph)); - for (types::size_type c = 0; c != inv_perm.size(); ++c) + for (boosttypes::size_type c = 0; c != inv_perm.size(); ++c) new_dof_indices[index_map[inv_perm[c]]] = c; Assert (std::find (new_dof_indices.begin(), new_dof_indices.end(), @@ -282,25 +283,25 @@ namespace DoFRenumbering "compiler error and has been disabled. If you need to use the " "function, you need to upgrade to a newer version of the compiler.")); #else - types::Graph + boosttypes::Graph graph(dof_handler.n_dofs()); - types::property_map::type + boosttypes::property_map::type graph_degree; internal::create_graph (dof_handler, use_constraints, graph, graph_degree); - types::property_map::type + boosttypes::property_map::type index_map = get(::boost::vertex_index, graph); - std::vector inv_perm(num_vertices(graph)); + std::vector inv_perm(num_vertices(graph)); if (reversed_numbering == false) ::boost::king_ordering(graph, inv_perm.rbegin()); else ::boost::king_ordering(graph, inv_perm.begin()); - for (types::size_type c = 0; c != inv_perm.size(); ++c) + for (boosttypes::size_type c = 0; c != inv_perm.size(); ++c) new_dof_indices[index_map[inv_perm[c]]] = c; Assert (std::find (new_dof_indices.begin(), new_dof_indices.end(),