From: Matthias Maier <tamiko@43-1.org>
Date: Tue, 20 Mar 2018 17:50:57 +0000 (-0500)
Subject: Merge pull request #5994 from masterleinad/avoid_clash_class_namespace
X-Git-Tag: v9.0.0-rc1~300
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83ec27733385610343f7e23f87c21e6a7f9cb194;p=dealii.git

Merge pull request #5994 from masterleinad/avoid_clash_class_namespace

Avoid clashes of class names and namespace names
---

83ec27733385610343f7e23f87c21e6a7f9cb194
diff --cc source/grid/tria.cc
index 99f37561ce,6500f2c025..2b966022ff
--- a/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>();
  }