From b978fa8fddaa4d1479eb0cbcb29c3bfad0ae0887 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Mon, 21 Nov 2016 15:49:43 +0100 Subject: [PATCH] Fix the typedef for the Bare_point --- Triangulation_3/include/CGAL/Regular_triangulation_3.h | 7 ++++++- Triangulation_3/test/Triangulation_3/test_regular_3.cpp | 1 - 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Triangulation_3/include/CGAL/Regular_triangulation_3.h b/Triangulation_3/include/CGAL/Regular_triangulation_3.h index b46c1510e7b..ff006ea4f4f 100644 --- a/Triangulation_3/include/CGAL/Regular_triangulation_3.h +++ b/Triangulation_3/include/CGAL/Regular_triangulation_3.h @@ -131,7 +131,12 @@ namespace CGAL { typedef typename Tr_Base::All_cells_iterator All_cells_iterator; typedef typename Gt::Weighted_point_3 Weighted_point; - typedef typename Gt::Point_3 Bare_point; + typedef typename boost::mpl::eval_if_c< + internal::Has_nested_type_Bare_point::value, + typename internal::Bare_point_type, + boost::mpl::identity + >::type Bare_point; + typedef typename Gt::Segment_3 Segment; typedef typename Gt::Triangle_3 Triangle; typedef typename Gt::Tetrahedron_3 Tetrahedron; diff --git a/Triangulation_3/test/Triangulation_3/test_regular_3.cpp b/Triangulation_3/test/Triangulation_3/test_regular_3.cpp index 3da3488c0ca..92a421866c3 100644 --- a/Triangulation_3/test/Triangulation_3/test_regular_3.cpp +++ b/Triangulation_3/test/Triangulation_3/test_regular_3.cpp @@ -20,7 +20,6 @@ // : Mariette Yvinec (Mariette.Yvinec@sophia.inria.fr) #include - #include #include #include