From d874698109e4492d4d36b8d364bf82899b992b26 Mon Sep 17 00:00:00 2001 From: Jane Tournois Date: Thu, 2 Oct 2014 10:49:16 +0200 Subject: [PATCH 1/4] fix implementation of Delaunay_triangulation_cell_base_3 --- .../include/CGAL/Delaunay_triangulation_cell_base_3.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Triangulation_3/include/CGAL/Delaunay_triangulation_cell_base_3.h b/Triangulation_3/include/CGAL/Delaunay_triangulation_cell_base_3.h index 87adeea4723..7b2870db87a 100644 --- a/Triangulation_3/include/CGAL/Delaunay_triangulation_cell_base_3.h +++ b/Triangulation_3/include/CGAL/Delaunay_triangulation_cell_base_3.h @@ -32,7 +32,7 @@ namespace CGAL { template < typename GT, typename Cb = Triangulation_ds_cell_base_3<> > -class Triangulation_cell_base_3 +class Delaunay_triangulation_cell_base_3 : public Triangulation_cell_base_3 { public: From 9e921b1d4817133cea612858b5198b2c20d04cb3 Mon Sep 17 00:00:00 2001 From: Jane Tournois Date: Thu, 2 Oct 2014 11:28:43 +0200 Subject: [PATCH 2/4] add typedef requested as documented --- .../include/CGAL/Delaunay_triangulation_cell_base_3.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Triangulation_3/include/CGAL/Delaunay_triangulation_cell_base_3.h b/Triangulation_3/include/CGAL/Delaunay_triangulation_cell_base_3.h index 7b2870db87a..0751af23af6 100644 --- a/Triangulation_3/include/CGAL/Delaunay_triangulation_cell_base_3.h +++ b/Triangulation_3/include/CGAL/Delaunay_triangulation_cell_base_3.h @@ -36,8 +36,10 @@ class Delaunay_triangulation_cell_base_3 : public Triangulation_cell_base_3 { public: + + typedef typename Geom_traits::Point_3 Point_3; - typename Geom_traits::Point_3 + Point_3 circumcenter(const Geom_traits& gt = Geom_traits()) const { return gt.construct_circumcenter_3_object()(this->vertex(0)->point(), From a68adcffb2e9d046d74a506d2137d15bb437a450 Mon Sep 17 00:00:00 2001 From: Jane Tournois Date: Thu, 2 Oct 2014 11:30:30 +0200 Subject: [PATCH 3/4] add code to test Delaunay_cell_base_3 --- .../test/Triangulation_3/test_delaunay_3.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/Triangulation_3/test/Triangulation_3/test_delaunay_3.cpp b/Triangulation_3/test/Triangulation_3/test_delaunay_3.cpp index b047ff638c1..76ee1d969a0 100644 --- a/Triangulation_3/test/Triangulation_3/test_delaunay_3.cpp +++ b/Triangulation_3/test/Triangulation_3/test_delaunay_3.cpp @@ -21,6 +21,9 @@ #define CGAL_NO_DEPRECATION_WARNINGS #include +#include +#include +#include #include bool del=true; @@ -39,7 +42,15 @@ int main() _test_cls_delaunay_3( Cls() ); _test_cls_delaunay_3( Cls_with_epec() ); - + + typedef CGAL::Triangulation_data_structure_3< + CGAL::Triangulation_vertex_base_3, + CGAL::Delaunay_triangulation_cell_base_3 > Tds_Delaunay_Cb; + typedef CGAL::Delaunay_triangulation_3< + EPIC, Tds_Delaunay_Cb> Cls_with_Delaunay_Cb; + + _test_cls_delaunay_3( Cls_with_Delaunay_Cb() ); + #ifdef CGAL_LINKED_WITH_TBB typedef CGAL::Spatial_lock_grid_3< CGAL::Tag_priority_blocking> Lock_ds; From 545fe183104f37f0cae09a00c0bb79ae5091cc48 Mon Sep 17 00:00:00 2001 From: Jane Tournois Date: Fri, 3 Oct 2014 17:11:08 +0200 Subject: [PATCH 4/4] add missing typedef for compilation on Linux --- .../include/CGAL/Delaunay_triangulation_cell_base_3.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Triangulation_3/include/CGAL/Delaunay_triangulation_cell_base_3.h b/Triangulation_3/include/CGAL/Delaunay_triangulation_cell_base_3.h index 0751af23af6..a52443c3566 100644 --- a/Triangulation_3/include/CGAL/Delaunay_triangulation_cell_base_3.h +++ b/Triangulation_3/include/CGAL/Delaunay_triangulation_cell_base_3.h @@ -36,7 +36,7 @@ class Delaunay_triangulation_cell_base_3 : public Triangulation_cell_base_3 { public: - + typedef GT Geom_traits; typedef typename Geom_traits::Point_3 Point_3; Point_3