diff --git a/Linear_cell_complex/demo/Linear_cell_complex/typedefs.h b/Linear_cell_complex/demo/Linear_cell_complex/typedefs.h index 572e142aa28..922fa1c654c 100644 --- a/Linear_cell_complex/demo/Linear_cell_complex/typedefs.h +++ b/Linear_cell_complex/demo/Linear_cell_complex/typedefs.h @@ -194,8 +194,7 @@ typedef CGAL::Triangulation_face_base_with_info_2 Fb1; typedef CGAL::Constrained_triangulation_face_base_2 Fb; typedef CGAL::Triangulation_data_structure_2 TDS; -// typedef CGAL::No_intersection_tag Itag; - typedef CGAL::Exact_predicates_tag Itag; +typedef CGAL::Exact_predicates_tag Itag; typedef CGAL::Constrained_Delaunay_triangulation_2 CDT; diff --git a/Linear_cell_complex/examples/Linear_cell_complex/basic_viewer.h b/Linear_cell_complex/examples/Linear_cell_complex/basic_viewer.h index 0ca4f962109..da1ad9e451a 100644 --- a/Linear_cell_complex/examples/Linear_cell_complex/basic_viewer.h +++ b/Linear_cell_complex/examples/Linear_cell_complex/basic_viewer.h @@ -223,7 +223,6 @@ class Basic_viewer : public CGAL::QGLViewer, public QOpenGLFunctions_2_1 typedef CGAL::Constrained_triangulation_face_base_2 Fb; typedef CGAL::Triangulation_data_structure_2 TDS; - // typedef CGAL::No_intersection_tag Itag; typedef CGAL::Exact_predicates_tag Itag; typedef CGAL::Constrained_Delaunay_triangulation_2 CDT; diff --git a/Nef_3/include/CGAL/Nef_3/K3_tree.h b/Nef_3/include/CGAL/Nef_3/K3_tree.h index bf211011575..21f4d3654c8 100644 --- a/Nef_3/include/CGAL/Nef_3/K3_tree.h +++ b/Nef_3/include/CGAL/Nef_3/K3_tree.h @@ -171,11 +171,11 @@ private: template class Triangulation_handler { - typedef typename CGAL::Triangulation_vertex_base_2 Vb; - typedef typename CGAL::Constrained_triangulation_face_base_2 Fb; - typedef typename CGAL::Triangulation_data_structure_2 TDS; - typedef typename CGAL::No_intersection_tag Itag; - typedef typename CGAL::Constrained_triangulation_2 CT; + typedef typename CGAL::Triangulation_vertex_base_2 Vb; + typedef typename CGAL::Constrained_triangulation_face_base_2 Fb; + typedef typename CGAL::Triangulation_data_structure_2 TDS; + typedef typename CGAL::No_constraint_intersection_requiring_constructions_tag Itag; + typedef typename CGAL::Constrained_triangulation_2 CT; typedef typename CT::Face_handle Face_handle; typedef typename CT::Finite_faces_iterator Finite_face_iterator; diff --git a/Nef_3/include/CGAL/Nef_3/SNC_point_locator.h b/Nef_3/include/CGAL/Nef_3/SNC_point_locator.h index 3babbc24689..28738aff817 100644 --- a/Nef_3/include/CGAL/Nef_3/SNC_point_locator.h +++ b/Nef_3/include/CGAL/Nef_3/SNC_point_locator.h @@ -221,11 +221,11 @@ public: template class Triangulation_handler { - typedef typename CGAL::Triangulation_vertex_base_2 Vb; - typedef typename CGAL::Constrained_triangulation_face_base_2 Fb; - typedef typename CGAL::Triangulation_data_structure_2 TDS; - typedef typename CGAL::No_intersection_tag Itag; - typedef typename CGAL::Constrained_triangulation_2 CT; + typedef typename CGAL::Triangulation_vertex_base_2 Vb; + typedef typename CGAL::Constrained_triangulation_face_base_2 Fb; + typedef typename CGAL::Triangulation_data_structure_2 TDS; + typedef typename CGAL::No_constraint_intersection_requiring_constructions_tag Itag; + typedef typename CGAL::Constrained_triangulation_2 CT; typedef typename CT::Face_handle Face_handle; typedef typename CT::Finite_faces_iterator Finite_face_iterator; diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_2/Mesh_2_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Mesh_2/Mesh_2_plugin.cpp index c007f78408f..4eb543bf0de 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Mesh_2/Mesh_2_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Mesh_2/Mesh_2_plugin.cpp @@ -257,15 +257,15 @@ private: // wait cursor QApplication::setOverrideCursor(Qt::WaitCursor); - typedef ProjectionTraits Gt; - typedef CGAL::Delaunay_mesh_vertex_base_2 Vb; - typedef CGAL::Delaunay_mesh_face_base_2 Fm; - typedef CGAL::Triangulation_face_base_with_info_2 Fb; - typedef CGAL::Triangulation_data_structure_2 TDS; - typedef CGAL::No_intersection_tag Tag; - typedef CGAL::Constrained_Delaunay_triangulation_2 CDT; - typedef CGAL::Delaunay_mesh_size_criteria_2 Criteria; - typedef CGAL::Delaunay_mesher_2 Mesher; + typedef ProjectionTraits Gt; + typedef CGAL::Delaunay_mesh_vertex_base_2 Vb; + typedef CGAL::Delaunay_mesh_face_base_2 Fm; + typedef CGAL::Triangulation_face_base_with_info_2 Fb; + typedef CGAL::Triangulation_data_structure_2 TDS; + typedef CGAL::No_constraint_intersection_requiring_constructions_tag Tag; + typedef CGAL::Constrained_Delaunay_triangulation_2 CDT; + typedef CGAL::Delaunay_mesh_size_criteria_2 Criteria; + typedef CGAL::Delaunay_mesher_2 Mesher; QTime time; // global timer time.start(); diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Engrave_text_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PMP/Engrave_text_plugin.cpp index fbd416ee949..9d9f937cbe1 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Engrave_text_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PMP/Engrave_text_plugin.cpp @@ -105,11 +105,11 @@ struct Top typedef EPICK Gt; typedef CGAL::Triangulation_vertex_base_2 Vb; -typedef CGAL::Triangulation_face_base_with_info_2 Fbb; +typedef CGAL::Triangulation_face_base_with_info_2 Fbb; typedef CGAL::Constrained_triangulation_face_base_2 Fb; -typedef CGAL::Triangulation_data_structure_2 TDS; -typedef CGAL::No_intersection_tag Tag; -typedef CGAL::Constrained_Delaunay_triangulation_2 CDT; +typedef CGAL::Triangulation_data_structure_2 TDS; +typedef CGAL::No_constraint_intersection_requiring_constructions_tag Tag; +typedef CGAL::Constrained_Delaunay_triangulation_2 CDT; //Parameterization and text displaying class ParamItem : public QGraphicsItem diff --git a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/MVC_post_processor_3.h b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/MVC_post_processor_3.h index 1daced092cc..14354576b32 100644 --- a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/MVC_post_processor_3.h +++ b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/MVC_post_processor_3.h @@ -137,17 +137,16 @@ private: // Types used for the convexification of the mesh // Each triangulation vertex is associated its corresponding vertex_descriptor - typedef CGAL::Triangulation_vertex_base_with_info_2 Vb; - // Each triangultaion face is associated a color (inside/outside information) - typedef CGAL::Triangulation_face_base_with_info_2 Fb; - typedef CGAL::Constrained_triangulation_face_base_2 Cfb; - typedef CGAL::Triangulation_data_structure_2 TDS; - typedef CGAL::No_intersection_tag Itag; + typedef CGAL::Triangulation_vertex_base_with_info_2 Vb; + // Each triangulation face is associated a color (inside/outside information) + typedef CGAL::Triangulation_face_base_with_info_2 Fb; + typedef CGAL::Constrained_triangulation_face_base_2 Cfb; + typedef CGAL::Triangulation_data_structure_2 TDS; + typedef CGAL::No_constraint_intersection_requiring_constructions_tag Itag; // Can choose either a triangulation or a Delaunay triangulation - typedef CGAL::Constrained_triangulation_2 CT; -// typedef CGAL::Constrained_Delaunay_triangulation_2 CT; + typedef CGAL::Constrained_triangulation_2 CT; +// typedef CGAL::Constrained_Delaunay_triangulation_2 CT; // Private fields private: diff --git a/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_constrained_triangulation_2.h b/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_constrained_triangulation_2.h index 60d25f3fb0f..d7419f80846 100644 --- a/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_constrained_triangulation_2.h +++ b/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_constrained_triangulation_2.h @@ -52,24 +52,36 @@ _test_cdt_throwing(const Pt& p0, const Pt& p1, const Pt& p2, const Pt& p3, // There must have been an intersection assert(intersection_type != NO_INTERSECTION); - // If the intersection requires no construction, then only 'no_intersection_tag' throws - if(intersection_type == INTERSECTION_WITHOUT_CONSTRUCTION) { - assert((boost::is_same::value)); - } else { + // If the intersection requires no construction, then only 'No_constraint_intersection_tag' throws + if(intersection_type == INTERSECTION_WITHOUT_CONSTRUCTION) + { + assert((boost::is_same::value)); + } + else // threw and it's not a construction-less intersection ---> real intersection + { assert(intersection_type == INTERSECTION); - assert((boost::is_same::value) || - (boost::is_same::value)); + assert((boost::is_same::value) || +#ifndef CGAL_NO_DEPRECATED_CODE + (boost::is_same::value) || +#endif + (boost::is_same::value)); } return; } - if(intersection_type == INTERSECTION_WITHOUT_CONSTRUCTION) { - // Even with an intersection without construction, 'No_intersection_tag' should throw - assert(!(boost::is_same::value)); - } else if(intersection_type == INTERSECTION) { - assert(!(boost::is_same::value) && - !(boost::is_same::value)); + if(intersection_type == INTERSECTION_WITHOUT_CONSTRUCTION) + { + // Even with an intersection without construction, 'No_constraint_intersection_tag' should have thrown + assert(!(boost::is_same::value)); + } + else if(intersection_type == INTERSECTION) + { + assert(!(boost::is_same::value) && +#ifndef CGAL_NO_DEPRECATED_CODE + !(boost::is_same::value) && +#endif + !(boost::is_same::value)); } } diff --git a/Triangulation_2/test/Triangulation_2/test_cdt_2_projection_traits_special_case.cpp b/Triangulation_2/test/Triangulation_2/test_cdt_2_projection_traits_special_case.cpp index f37eb4174a1..26693b95a28 100644 --- a/Triangulation_2/test/Triangulation_2/test_cdt_2_projection_traits_special_case.cpp +++ b/Triangulation_2/test/Triangulation_2/test_cdt_2_projection_traits_special_case.cpp @@ -29,10 +29,10 @@ bool test(std::string test_name) std::cerr << "Testing " << test_name << std::endl; const unsigned nb_input_points = sizeof(input)/sizeof(vec); - typedef CGAL::Constrained_triangulation_face_base_2 CDT_2_fb; - typedef CGAL::Triangulation_vertex_base_2 CDT_2_vb; - typedef CGAL::Triangulation_data_structure_2 CDT_2_tds; - typedef CGAL::No_intersection_tag CDT_2_itag; + typedef CGAL::Constrained_triangulation_face_base_2 CDT_2_fb; + typedef CGAL::Triangulation_vertex_base_2 CDT_2_vb; + typedef CGAL::Triangulation_data_structure_2 CDT_2_tds; + typedef CGAL::No_constraint_intersection_requiring_constructions_tag CDT_2_itag; typedef CGAL::Constrained_Delaunay_triangulation_2 CDT_2; diff --git a/Triangulation_2/test/Triangulation_2/test_const_del_triangulation_2.cpp b/Triangulation_2/test/Triangulation_2/test_const_del_triangulation_2.cpp index 2ef4cd90a17..3f1c18b5d73 100644 --- a/Triangulation_2/test/Triangulation_2/test_const_del_triangulation_2.cpp +++ b/Triangulation_2/test/Triangulation_2/test_const_del_triangulation_2.cpp @@ -30,9 +30,8 @@ template class CGAL::Constrained_Delaunay_triangulation_2; int main() { - std::cout << "Testing constrained_Delaunay_triangulation "<< std::endl; - std::cout << " with No_intersection_tag : " << std::endl; + std::cout << " with No_constraint_intersection_requiring_constructions_tag : " << std::endl; typedef CGAL::Constrained_Delaunay_triangulation_2 CDt2; _test_cls_const_Del_triangulation(CDt2()); diff --git a/Triangulation_2/test/Triangulation_2/test_constrained_triangulation_2.cpp b/Triangulation_2/test/Triangulation_2/test_constrained_triangulation_2.cpp index 4af4b90c470..64851021f7b 100644 --- a/Triangulation_2/test/Triangulation_2/test_constrained_triangulation_2.cpp +++ b/Triangulation_2/test/Triangulation_2/test_constrained_triangulation_2.cpp @@ -22,6 +22,8 @@ #define CGAL_NO_CDT_2_WARNING +#include + #include #include @@ -33,16 +35,24 @@ template class CGAL::Constrained_triangulation_2; int main() { std::cout << "Testing constrained_triangulation "<< std::endl; - std::cout << " with No_intersection_tag : " << std::endl; - typedef CGAL::Constrained_triangulation_2 Ct; - _test_cls_constrained_triangulation(Ct()); - - std::cout << "Testing constrained_triangulation "<< std::endl; - std::cout << " with No_intersection_requiring_constructions_tag : " << std::endl; - typedef CGAL::No_intersection_requiring_constructions_tag CItag; + std::cout << " with No_constraint_intersection_tag : " << std::endl; + typedef CGAL::No_constraint_intersection_tag CItag; typedef CGAL::Constrained_triangulation_2 Ctwoc; _test_cls_constrained_triangulation(Ctwoc()); + std::exit(1); + + std::cout << "Testing constrained_triangulation "<< std::endl; + std::cout << " with No_constraint_intersection_requiring_constructions_tag (default): " << std::endl; + +#ifndef CGAL_NO_DEPRECATED_CODE + typedef CGAL::No_intersection_tag CDItag; + typedef CGAL::Constrained_triangulation_2 Ct; +#else + typedef CGAL::Constrained_triangulation_2 Ct; +#endif + _test_cls_constrained_triangulation(Ct()); + std::cout << "Testing constrained_triangulation "<< std::endl; std::cout << " with Exact_predicates_tag : " << std::endl; typedef CGAL::Triangulation_vertex_base_2 Vb; diff --git a/Visibility_2/include/CGAL/Triangular_expansion_visibility_2.h b/Visibility_2/include/CGAL/Triangular_expansion_visibility_2.h index a878bd2b96f..9956dd7c32c 100644 --- a/Visibility_2/include/CGAL/Triangular_expansion_visibility_2.h +++ b/Visibility_2/include/CGAL/Triangular_expansion_visibility_2.h @@ -75,13 +75,13 @@ public: typedef CGAL::Tag_true Supports_simple_polygon_category; private: - typedef CGAL::Triangulation_vertex_base_2 Vb; - typedef CGAL::Constrained_triangulation_face_base_2 Fb; - typedef CGAL::Triangulation_data_structure_2 TDS; - typedef CGAL::No_intersection_tag Itag; - typedef CGAL::Constrained_Delaunay_triangulation_2 CDT; + typedef CGAL::Triangulation_vertex_base_2 Vb; + typedef CGAL::Constrained_triangulation_face_base_2 Fb; + typedef CGAL::Triangulation_data_structure_2 TDS; + typedef CGAL::No_constraint_intersection_requiring_constructions_tag Itag; + typedef CGAL::Constrained_Delaunay_triangulation_2 CDT; - typedef std::pair Constraint; + typedef std::pair Constraint; // Functor to create edge constraints for the CDT out of Halfedges struct Make_constraint