From e63d20cf2282a4b34c6787a1b17f32c2d58754fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Thu, 3 Oct 2019 15:30:16 +0200 Subject: [PATCH] Uniformize namespaces --- .../Surface_mesh_shortest_path.h | 16 +++++++++------- .../internal/Cone_expansion_event.h | 4 ++-- .../internal/Cone_tree.h | 4 ++-- .../internal/misc_functions.h | 4 ++-- .../Surface_mesh_shortest_path_test_4.cpp | 2 +- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path.h b/Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path.h index d4b6a794a15..67e74a28136 100644 --- a/Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path.h +++ b/Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path.h @@ -292,10 +292,12 @@ private: typedef typename Traits::Point_2 Point_2; typedef typename Traits::Vector_2 Vector_2; - typedef SMSP::internal::Cone_tree_node Cone_tree_node; - typedef SMSP::internal::Cone_expansion_event Cone_expansion_event; + typedef Surface_mesh_shortest_paths_3::internal::Cone_tree_node Cone_tree_node; + typedef Surface_mesh_shortest_paths_3::internal::Cone_expansion_event Cone_expansion_event; - typedef std::priority_queue, SMSP::internal::Cone_expansion_event_min_priority_queue_comparator > Expansion_priqueue; + typedef std::priority_queue, + Surface_mesh_shortest_paths_3::internal::Cone_expansion_event_min_priority_queue_comparator > Expansion_priqueue; typedef std::pair Node_distance_pair; private: @@ -494,7 +496,7 @@ private: static Triangle_3 triangle_from_halfedge(halfedge_descriptor edge, const Triangle_mesh& tm, Vertex_point_map vertexPointMap) { - return SMSP::internal::triangle_from_halfedge(edge, tm, vertexPointMap); + return Surface_mesh_shortest_paths_3::internal::triangle_from_halfedge(edge, tm, vertexPointMap); } Triangle_3 triangle_from_face(face_descriptor f) const @@ -1742,7 +1744,7 @@ private: halfedge_descriptor oppositeHalfedge = opposite(he, m_graph); if(!CGAL::is_border(oppositeHalfedge, m_graph)) { - std::size_t oppositeIndex = SMSP::internal::edge_index(oppositeHalfedge, m_graph); + std::size_t oppositeIndex = Surface_mesh_shortest_paths_3::internal::edge_index(oppositeHalfedge, m_graph); FT oppositeLocationCoords[3] = { FT(0), FT(0), FT(0) }; oppositeLocationCoords[oppositeIndex] = cbcw(location, (associatedEdge + 1) % 3); @@ -2546,7 +2548,7 @@ public: halfedge_descriptor he = next(hinit, tm); face_descriptor locationFace = face(he, tm); - std::size_t edgeIndex = SMSP::internal::edge_index(he, tm); + std::size_t edgeIndex = Surface_mesh_shortest_paths_3::internal::edge_index(he, tm); FT coords[3] = { FT(0), FT(0), FT(0) }; @@ -2577,7 +2579,7 @@ public: { typename Traits::Construct_barycentric_coordinates cbc(traits.construct_barycentric_coordinates_object()); face_descriptor locationFace = face(he, tm); - std::size_t edgeIndex = SMSP::internal::edge_index(he, tm); + std::size_t edgeIndex = Surface_mesh_shortest_paths_3::internal::edge_index(he, tm); const FT oneMinusT(FT(1) - t); diff --git a/Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/internal/Cone_expansion_event.h b/Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/internal/Cone_expansion_event.h index 42f6dec1d8f..5607925f4d3 100644 --- a/Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/internal/Cone_expansion_event.h +++ b/Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/internal/Cone_expansion_event.h @@ -24,7 +24,7 @@ #include namespace CGAL { -namespace SMSP { +namespace Surface_mesh_shortest_paths_3 { namespace internal { template @@ -83,7 +83,7 @@ public: }; } // namespace internal -} // namespace SMSP +} // namespace Surface_mesh_shortest_paths_3 } // namespace CGAL #endif // CGAL_SURFACE_MESH_SHORTEST_PATH_INTERNAL_CONE_EXPANSION_EVENT_H diff --git a/Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/internal/Cone_tree.h b/Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/internal/Cone_tree.h index 807a8565648..bd83da484c3 100644 --- a/Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/internal/Cone_tree.h +++ b/Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/internal/Cone_tree.h @@ -34,7 +34,7 @@ #include namespace CGAL { -namespace SMSP { +namespace Surface_mesh_shortest_paths_3 { namespace internal { template @@ -434,7 +434,7 @@ public: }; } // namespace internal -} // namespace SMSP +} // namespace Surface_mesh_shortest_paths_3 } // namespace CGAL #endif // CGAL_SURFACE_MESH_SHORTEST_PATH_INTERNAL_CONE_TREE_H diff --git a/Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/internal/misc_functions.h b/Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/internal/misc_functions.h index ffd9b8bd4c9..27c2614b073 100644 --- a/Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/internal/misc_functions.h +++ b/Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/internal/misc_functions.h @@ -29,7 +29,7 @@ #include namespace CGAL { -namespace SMSP { +namespace Surface_mesh_shortest_paths_3 { namespace internal { template @@ -74,7 +74,7 @@ size_t edge_index(typename boost::graph_traits::halfedge_descript } } // namespace internal -} // namespace SMSP +} // namespace Surface_mesh_shortest_paths_3 } // namespace CGAL #endif // CGAL_SURFACE_MESH_SHORTEST_PATH_INTERNAL_MISC_H diff --git a/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/Surface_mesh_shortest_path_test_4.cpp b/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/Surface_mesh_shortest_path_test_4.cpp index 806087ad4e8..3c57487983c 100644 --- a/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/Surface_mesh_shortest_path_test_4.cpp +++ b/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/Surface_mesh_shortest_path_test_4.cpp @@ -94,7 +94,7 @@ int main(int argc, char* argv[]) size_t faceIndex = random.get_int(0, static_cast(facesList.size())); face_descriptor face = facesList[faceIndex]; - Triangle_3 faceTriangle = CGAL::SMSP::internal::triangle_from_halfedge(halfedge(face, polyhedron), polyhedron, vertexPointMap); + Triangle_3 faceTriangle = CGAL::Surface_mesh_shortest_paths_3::internal::triangle_from_halfedge(halfedge(face, polyhedron), polyhedron, vertexPointMap); Barycentric_coordinates location = CGAL::test::random_coordinates(random);