From 0e5b7362425cfec34c817f99019fa7fcfdee6295 Mon Sep 17 00:00:00 2001 From: "liangliang.nan" Date: Tue, 25 Jun 2019 17:06:55 +0200 Subject: [PATCH] added namespace "CGAL::" to avoid name conflicts. tested on Windows, macOS, and Linux/Ubuntu --- .../CGAL/internal/compute_confidences.h | 24 +++++++++---------- .../include/CGAL/internal/hypothesis.h | 20 ++++++++-------- .../CGAL/internal/point_set_with_planes.h | 22 ++++++++--------- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/Polygonal_surface_reconstruction/include/CGAL/internal/compute_confidences.h b/Polygonal_surface_reconstruction/include/CGAL/internal/compute_confidences.h index e8dcf3eaf85..00ee4357b98 100644 --- a/Polygonal_surface_reconstruction/include/CGAL/internal/compute_confidences.h +++ b/Polygonal_surface_reconstruction/include/CGAL/internal/compute_confidences.h @@ -53,21 +53,21 @@ namespace CGAL { class Candidate_confidences { private: - typedef typename Kernel::FT FT; - typedef typename Kernel::Point_3 Point; - typedef typename Kernel::Point_2 Point2; - typedef typename Kernel::Vector_3 Vector; - typedef typename Kernel::Line_3 Line; - typedef typename Kernel::Segment_3 Segment; - typedef typename Kernel::Plane_3 Plane; - typedef CGAL::Polygon_2 Polygon; - typedef Planar_segment Planar_segment; - typedef Point_set_with_planes Point_set; - typedef CGAL::Surface_mesh Polygon_mesh; + typedef typename Kernel::FT FT; + typedef typename Kernel::Point_3 Point; + typedef typename Kernel::Point_2 Point2; + typedef typename Kernel::Vector_3 Vector; + typedef typename Kernel::Line_3 Line; + typedef typename Kernel::Segment_3 Segment; + typedef typename Kernel::Plane_3 Plane; + typedef CGAL::Polygon_2 Polygon; + typedef internal::Planar_segment Planar_segment; + typedef internal::Point_set_with_planes Point_set; + typedef CGAL::Surface_mesh Polygon_mesh; typedef typename Polygon_mesh::Face_index Face_descriptor; typedef typename Polygon_mesh::Edge_index Edge_descriptor; typedef typename Polygon_mesh::Vertex_index Vertex_descriptor; - typedef typename Polygon_mesh::Halfedge_index Halfedge_descriptor; + typedef typename Polygon_mesh::Halfedge_index Halfedge_descriptor; public: Candidate_confidences() {} diff --git a/Polygonal_surface_reconstruction/include/CGAL/internal/hypothesis.h b/Polygonal_surface_reconstruction/include/CGAL/internal/hypothesis.h index e985f688114..c4c20d1bdc6 100644 --- a/Polygonal_surface_reconstruction/include/CGAL/internal/hypothesis.h +++ b/Polygonal_surface_reconstruction/include/CGAL/internal/hypothesis.h @@ -48,17 +48,17 @@ namespace CGAL { class Hypothesis { private: - typedef typename Kernel::FT FT; - typedef typename Kernel::Point_3 Point; - typedef typename Kernel::Point_2 Point2; - typedef typename Kernel::Vector_3 Vector; - typedef typename Kernel::Line_3 Line; - typedef typename Kernel::Segment_3 Segment; - typedef typename Kernel::Plane_3 Plane; - typedef Planar_segment Planar_segment; - typedef Point_set_with_planes Point_set_with_planes; + typedef typename Kernel::FT FT; + typedef typename Kernel::Point_3 Point; + typedef typename Kernel::Point_2 Point2; + typedef typename Kernel::Vector_3 Vector; + typedef typename Kernel::Line_3 Line; + typedef typename Kernel::Segment_3 Segment; + typedef typename Kernel::Plane_3 Plane; + typedef internal::Planar_segment Planar_segment; + typedef internal::Point_set_with_planes Point_set_with_planes; - typedef CGAL::Surface_mesh Polygon_mesh; + typedef CGAL::Surface_mesh Polygon_mesh; typedef typename Polygon_mesh::Face_index Face_descriptor; typedef typename Polygon_mesh::Edge_index Edge_descriptor; typedef typename Polygon_mesh::Vertex_index Vertex_descriptor; diff --git a/Polygonal_surface_reconstruction/include/CGAL/internal/point_set_with_planes.h b/Polygonal_surface_reconstruction/include/CGAL/internal/point_set_with_planes.h index 8ca0602caad..1bdc5ecf204 100644 --- a/Polygonal_surface_reconstruction/include/CGAL/internal/point_set_with_planes.h +++ b/Polygonal_surface_reconstruction/include/CGAL/internal/point_set_with_planes.h @@ -50,9 +50,9 @@ namespace CGAL { class Planar_segment : public std::vector { public: - typedef typename Kernel::Point_3 Point; - typedef typename Kernel::Plane_3 Plane; - typedef Point_set_with_planes Point_set; + typedef typename Kernel::Point_3 Point; + typedef typename Kernel::Plane_3 Plane; + typedef internal::Point_set_with_planes Point_set; public: @@ -84,8 +84,8 @@ namespace CGAL { Plane* supporting_plane() const { return supporting_plane_; } private: - Point_set * point_set_; - Plane * supporting_plane_; // The hypothesis generator owns this plane and manages the memory + Point_set * point_set_; + Plane * supporting_plane_; // The hypothesis generator owns this plane and manages the memory }; @@ -98,13 +98,13 @@ namespace CGAL { public: typedef Point_set_3 Base_class; - typedef Point_set_with_planes This_class; + typedef Point_set_with_planes This_class; - typedef typename Kernel::FT FT; - typedef typename Kernel::Point_3 Point; - typedef typename Kernel::Vector_3 Vector; - typedef typename Kernel::Plane_3 Plane; - typedef Planar_segment Planar_segment; + typedef typename Kernel::FT FT; + typedef typename Kernel::Point_3 Point; + typedef typename Kernel::Vector_3 Vector; + typedef typename Kernel::Plane_3 Plane; + typedef internal::Planar_segment Planar_segment; public: