]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
rename another types:: namespace to avoid name clash
authorheister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 13 Aug 2012 14:34:35 +0000 (14:34 +0000)
committerheister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 13 Aug 2012 14:34:35 +0000 (14:34 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_3@25940 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/source/dofs/dof_renumbering.cc

index 498a1d1592d948a4e1b8f0f645c2d0f98d8f19aa..fad2b36a3af39ba64b24f94a1df1f8c2e4049fae 100644 (file)
@@ -15,6 +15,7 @@
 #include <deal.II/base/thread_management.h>
 #include <deal.II/base/utilities.h>
 #include <deal.II/base/quadrature_lib.h>
+#include <deal.II/base/types.h>
 
 #include <deal.II/lac/sparsity_pattern.h>
 #include <deal.II/lac/sparsity_tools.h>
@@ -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 <class DH>
       void create_graph (const DH                                                       &dof_handler,
                          const bool                                                      use_constraints,
-                         types::Graph                                                   &graph,
-                         types::property_map<types::Graph,types::vertex_degree_t>::type &graph_degree)
+                         boosttypes::Graph                                                   &graph,
+                         boosttypes::property_map<boosttypes::Graph,boosttypes::vertex_degree_t>::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<types::Graph>::vertex_iterator ui, ui_end;
+        boosttypes::graph_traits<boosttypes::Graph>::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<types::Graph,types::vertex_degree_t>::type
+      boosttypes::property_map<boosttypes::Graph,boosttypes::vertex_degree_t>::type
         graph_degree;
 
       internal::create_graph (dof_handler, use_constraints, graph, graph_degree);
 
-      types::property_map<types::Graph, types::vertex_index_t>::type
+      boosttypes::property_map<boosttypes::Graph, boosttypes::vertex_index_t>::type
         index_map = get(::boost::vertex_index, graph);
 
 
-      std::vector<types::Vertex> inv_perm(num_vertices(graph));
+      std::vector<boosttypes::Vertex> 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<types::Graph,types::vertex_degree_t>::type
+      boosttypes::property_map<boosttypes::Graph,boosttypes::vertex_degree_t>::type
         graph_degree;
 
       internal::create_graph (dof_handler, use_constraints, graph, graph_degree);
 
-      types::property_map<types::Graph, types::vertex_index_t>::type
+      boosttypes::property_map<boosttypes::Graph, boosttypes::vertex_index_t>::type
         index_map = get(::boost::vertex_index, graph);
 
 
-      std::vector<types::Vertex> inv_perm(num_vertices(graph));
+      std::vector<boosttypes::Vertex> 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(),

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.