songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added namespace "CGAL::" to avoid name conflicts. 

tested on Windows, macOS, and Linux/Ubuntu
This commit is contained in:
liangliang.nan 2019-06-25 17:06:55 +02:00
parent 655fa4b30d
commit 0e5b736242
3 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Polygonal_surface_reconstruction/include/CGAL/internal/compute_confidences.h
View File

@ -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<Kernel> Polygon;
typedef Planar_segment<Kernel> Planar_segment;
typedef Point_set_with_planes<Kernel> Point_set;
typedef CGAL::Surface_mesh<Point> 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<Kernel> Polygon;
typedef internal::Planar_segment<Kernel> Planar_segment;
typedef internal::Point_set_with_planes<Kernel> Point_set;
typedef CGAL::Surface_mesh<Point> 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() {}

20
Polygonal_surface_reconstruction/include/CGAL/internal/hypothesis.h
View File

@ -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<Kernel> Planar_segment;
typedef Point_set_with_planes<Kernel> 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<Kernel> Planar_segment;
typedef internal::Point_set_with_planes<Kernel> Point_set_with_planes;
typedef CGAL::Surface_mesh<Point> Polygon_mesh;
typedef CGAL::Surface_mesh<Point> 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;

22
Polygonal_surface_reconstruction/include/CGAL/internal/point_set_with_planes.h
View File

@ -50,9 +50,9 @@ namespace CGAL {
class Planar_segment : public std::vector<std::size_t>
{
public:
typedef typename Kernel::Point_3 Point;
typedef typename Kernel::Plane_3 Plane;
typedef Point_set_with_planes<Kernel> Point_set;
typedef typename Kernel::Point_3 Point;
typedef typename Kernel::Plane_3 Plane;
typedef internal::Point_set_with_planes<Kernel> 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<typename Kernel::Point_3> Base_class;
typedef Point_set_with_planes<Kernel> This_class;
typedef Point_set_with_planes<Kernel> 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<Kernel> 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<Kernel> Planar_segment;
public: