Merge pull request #5994 from masterleinad/avoid_clash_class_namespace

Avoid clashes of class names and namespace names

diff --cc include/deal.II/base/symmetric_tensor.h
Simple merge

diff --cc include/deal.II/base/table.h
Simple merge

diff --cc include/deal.II/fe/fe.h
Simple merge

diff --cc include/deal.II/fe/fe_system.h
Simple merge

diff --cc include/deal.II/fe/mapping_manifold.h
Simple merge

diff --cc include/deal.II/grid/tria.h
Simple merge

diff --cc include/deal.II/lac/block_vector.h
Simple merge

diff --cc include/deal.II/lac/constraint_matrix.templates.h
Simple merge

diff --cc include/deal.II/lac/linear_operator.h
Simple merge

diff --cc include/deal.II/lac/sparse_matrix.templates.h
Simple merge

diff --cc include/deal.II/lac/trilinos_block_sparse_matrix.h
Simple merge

diff --cc include/deal.II/lac/trilinos_parallel_block_vector.h
Simple merge

diff --cc include/deal.II/lac/trilinos_sparse_matrix.h
Simple merge

diff --cc include/deal.II/lac/trilinos_vector.h
Simple merge

diff --cc include/deal.II/lac/vector.templates.h
Simple merge

diff --cc include/deal.II/lac/vector_memory.h
Simple merge

diff --cc include/deal.II/multigrid/multigrid.h
Simple merge

diff --cc source/base/polynomial.cc
Simple merge

diff --cc source/distributed/tria_base.cc
Simple merge

diff --cc source/dofs/dof_handler_policy.cc
Simple merge

diff --cc source/fe/mapping_q_generic.cc
Simple merge

diff --cc source/grid/tria.cc
index 99f37561cedf62630a775bc23e5ac8f62e12a524,6500f2c025399c8e15dabd560f12c71d05f9d24a..2b966022ff93b3287b05ae307ce395486adc600b
--- 1/source/grid/tria.cc
--- 2/source/grid/tria.cc
+++ b/source/grid/tria.cc
@@@ -8829,24 -8829,24 +8829,24 @@@ Triangulation (const MeshSmoothing smoo
  
  template <int dim, int spacedim>
  Triangulation<dim, spacedim>::
 -Triangulation (Triangulation<dim, spacedim> &&tria)
 -  :
 -  Subscriptor(tria),
 -  smooth_grid(tria.smooth_grid),
 -  periodic_face_pairs_level_0(std::move(tria.periodic_face_pairs_level_0)),
 -  periodic_face_map(std::move(tria.periodic_face_map)),
 -  levels(std::move(tria.levels)),
 -  faces(std::move(tria.faces)),
 -  vertices(std::move(tria.vertices)),
 -  vertices_used(std::move(tria.vertices_used)),
 -  manifold(std::move(tria.manifold)),
 -  anisotropic_refinement(tria.anisotropic_refinement),
 -  check_for_distorted_cells(tria.check_for_distorted_cells),
 -  number_cache(tria.number_cache),
 -  vertex_to_boundary_id_map_1d(std::move(tria.vertex_to_boundary_id_map_1d)),
 -  vertex_to_manifold_id_map_1d(std::move(tria.vertex_to_manifold_id_map_1d))
 +Triangulation (Triangulation<dim, spacedim> &&tria) noexcept
 +:
 +Subscriptor(std::move(tria)),
 +            smooth_grid(tria.smooth_grid),
 +            periodic_face_pairs_level_0(std::move(tria.periodic_face_pairs_level_0)),
 +            periodic_face_map(std::move(tria.periodic_face_map)),
 +            levels(std::move(tria.levels)),
 +            faces(std::move(tria.faces)),
 +            vertices(std::move(tria.vertices)),
 +            vertices_used(std::move(tria.vertices_used)),
 +            manifold(std::move(tria.manifold)),
 +            anisotropic_refinement(tria.anisotropic_refinement),
 +            check_for_distorted_cells(tria.check_for_distorted_cells),
 +            number_cache(std::move(tria.number_cache)),
 +            vertex_to_boundary_id_map_1d(std::move(tria.vertex_to_boundary_id_map_1d)),
 +            vertex_to_manifold_id_map_1d(std::move(tria.vertex_to_manifold_id_map_1d))
  {
-   tria.number_cache = internal::Triangulation::NumberCache<dim>();
+   tria.number_cache = internal::TriangulationImplementation::NumberCache<dim>();
  }
  
  

diff --cc source/lac/trilinos_sparse_matrix.cc
Simple merge

diff --cc tests/tests.h
Simple merge