From a971b5e9baf44ae683c116e378c7be805f71d25e Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Wed, 28 Aug 2013 14:29:01 +0200 Subject: [PATCH] Switch to Simple_cartesian --- .../minimum_enclosing_parallelogram_2.cpp | 5 ++--- .../Min_quadrilateral_2/minimum_enclosing_rectangle_2.cpp | 4 ++-- .../Min_quadrilateral_2/minimum_enclosing_strip_2.cpp | 4 ++-- .../Rectangular_p_center_2/rectangular_p_center_2.cpp | 4 ++-- .../examples/Inscribed_areas/extremal_polygon_2_area.cpp | 4 ++-- .../Inscribed_areas/extremal_polygon_2_perimeter.cpp | 4 ++-- .../examples/RangeSegmentTrees/range_tree_map_2.cpp | 6 +++--- .../examples/RangeSegmentTrees/range_tree_set_2.cpp | 6 +++--- .../examples/RangeSegmentTrees/segment_tree_map_2.cpp | 6 +++--- .../examples/RangeSegmentTrees/segment_tree_set_2.cpp | 6 +++--- .../examples/RangeSegmentTrees/segment_tree_set_3.cpp | 6 +++--- 11 files changed, 27 insertions(+), 28 deletions(-) diff --git a/Bounding_volumes/examples/Min_quadrilateral_2/minimum_enclosing_parallelogram_2.cpp b/Bounding_volumes/examples/Min_quadrilateral_2/minimum_enclosing_parallelogram_2.cpp index e95b462b816..f4c6d3ef568 100644 --- a/Bounding_volumes/examples/Min_quadrilateral_2/minimum_enclosing_parallelogram_2.cpp +++ b/Bounding_volumes/examples/Min_quadrilateral_2/minimum_enclosing_parallelogram_2.cpp @@ -1,12 +1,11 @@ -#include +#include #include #include #include #include #include -struct Kernel : public CGAL::Cartesian {}; - +typedef CGAL::Simple_cartesian Kernel; typedef Kernel::Point_2 Point_2; typedef Kernel::Line_2 Line_2; typedef CGAL::Polygon_2 Polygon_2; diff --git a/Bounding_volumes/examples/Min_quadrilateral_2/minimum_enclosing_rectangle_2.cpp b/Bounding_volumes/examples/Min_quadrilateral_2/minimum_enclosing_rectangle_2.cpp index 3127cbb47ad..66db5cef267 100644 --- a/Bounding_volumes/examples/Min_quadrilateral_2/minimum_enclosing_rectangle_2.cpp +++ b/Bounding_volumes/examples/Min_quadrilateral_2/minimum_enclosing_rectangle_2.cpp @@ -1,11 +1,11 @@ -#include +#include #include #include #include #include #include -struct Kernel : public CGAL::Cartesian {}; +typedef CGAL::Simple_cartesian Kernel; typedef Kernel::Point_2 Point_2; typedef Kernel::Line_2 Line_2; diff --git a/Bounding_volumes/examples/Min_quadrilateral_2/minimum_enclosing_strip_2.cpp b/Bounding_volumes/examples/Min_quadrilateral_2/minimum_enclosing_strip_2.cpp index bf87a3377a8..0bbfe6f8242 100644 --- a/Bounding_volumes/examples/Min_quadrilateral_2/minimum_enclosing_strip_2.cpp +++ b/Bounding_volumes/examples/Min_quadrilateral_2/minimum_enclosing_strip_2.cpp @@ -1,11 +1,11 @@ -#include +#include #include #include #include #include #include -struct Kernel : public CGAL::Cartesian {}; +typedef CGAL::Simple_cartesian Kernel; typedef Kernel::Point_2 Point_2; typedef Kernel::Line_2 Line_2; diff --git a/Bounding_volumes/examples/Rectangular_p_center_2/rectangular_p_center_2.cpp b/Bounding_volumes/examples/Rectangular_p_center_2/rectangular_p_center_2.cpp index 7af6bb7b543..ed47f2667eb 100644 --- a/Bounding_volumes/examples/Rectangular_p_center_2/rectangular_p_center_2.cpp +++ b/Bounding_volumes/examples/Rectangular_p_center_2/rectangular_p_center_2.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include @@ -9,7 +9,7 @@ typedef double FT; -typedef CGAL::Cartesian Kernel; +typedef CGAL::Simple_cartesian Kernel; typedef Kernel::Point_2 Point; typedef std::vector Cont; diff --git a/Inscribed_areas/examples/Inscribed_areas/extremal_polygon_2_area.cpp b/Inscribed_areas/examples/Inscribed_areas/extremal_polygon_2_area.cpp index 0e75643eb9e..df77ff62998 100644 --- a/Inscribed_areas/examples/Inscribed_areas/extremal_polygon_2_area.cpp +++ b/Inscribed_areas/examples/Inscribed_areas/extremal_polygon_2_area.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include @@ -8,7 +8,7 @@ typedef double FT; -typedef CGAL::Cartesian Kernel; +typedef CGAL::Simple_cartesian Kernel; typedef Kernel::Point_2 Point; typedef std::vector Index_cont; diff --git a/Inscribed_areas/examples/Inscribed_areas/extremal_polygon_2_perimeter.cpp b/Inscribed_areas/examples/Inscribed_areas/extremal_polygon_2_perimeter.cpp index b22cbf5bb06..f4a6ffedccb 100644 --- a/Inscribed_areas/examples/Inscribed_areas/extremal_polygon_2_perimeter.cpp +++ b/Inscribed_areas/examples/Inscribed_areas/extremal_polygon_2_perimeter.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include @@ -8,7 +8,7 @@ typedef double FT; -typedef CGAL::Cartesian Kernel; +typedef CGAL::Simple_cartesian Kernel; typedef Kernel::Point_2 Point; typedef std::vector Index_cont; diff --git a/SearchStructures/examples/RangeSegmentTrees/range_tree_map_2.cpp b/SearchStructures/examples/RangeSegmentTrees/range_tree_map_2.cpp index e57cc5b79ea..6924c9d7dbb 100644 --- a/SearchStructures/examples/RangeSegmentTrees/range_tree_map_2.cpp +++ b/SearchStructures/examples/RangeSegmentTrees/range_tree_map_2.cpp @@ -3,7 +3,7 @@ // Ti is the type of each dimension of the tree. -#include +#include #include #include #include @@ -12,8 +12,8 @@ #include -typedef CGAL::Cartesian Representation; -typedef CGAL::Range_tree_map_traits_2 Traits; +typedef CGAL::Simple_cartesian K; +typedef CGAL::Range_tree_map_traits_2 Traits; typedef CGAL::Range_tree_2 Range_tree_2_type; int main() diff --git a/SearchStructures/examples/RangeSegmentTrees/range_tree_set_2.cpp b/SearchStructures/examples/RangeSegmentTrees/range_tree_set_2.cpp index 43f2017b711..46518a75283 100644 --- a/SearchStructures/examples/RangeSegmentTrees/range_tree_set_2.cpp +++ b/SearchStructures/examples/RangeSegmentTrees/range_tree_set_2.cpp @@ -3,7 +3,7 @@ // Ti is the type of each dimension of the tree. -#include +#include #include #include #include @@ -11,8 +11,8 @@ #include #include -typedef CGAL::Cartesian Representation; -typedef CGAL::Range_segment_tree_set_traits_2 Traits; +typedef CGAL::Simple_cartesian K; +typedef CGAL::Range_segment_tree_set_traits_2 Traits; typedef CGAL::Range_tree_2 Range_tree_2_type; int main() diff --git a/SearchStructures/examples/RangeSegmentTrees/segment_tree_map_2.cpp b/SearchStructures/examples/RangeSegmentTrees/segment_tree_map_2.cpp index 9bb5bcde3cc..809960c5bf7 100644 --- a/SearchStructures/examples/RangeSegmentTrees/segment_tree_map_2.cpp +++ b/SearchStructures/examples/RangeSegmentTrees/segment_tree_map_2.cpp @@ -7,14 +7,14 @@ #include #include #include -#include +#include #include #include -typedef CGAL::Cartesian Representation; -typedef CGAL::Segment_tree_map_traits_2 Traits; +typedef CGAL::Simple_cartesian K; +typedef CGAL::Segment_tree_map_traits_2 Traits; typedef CGAL::Segment_tree_2 Segment_tree_2_type; int main() diff --git a/SearchStructures/examples/RangeSegmentTrees/segment_tree_set_2.cpp b/SearchStructures/examples/RangeSegmentTrees/segment_tree_set_2.cpp index 3d4ef8ccd48..bb49f6da73e 100644 --- a/SearchStructures/examples/RangeSegmentTrees/segment_tree_set_2.cpp +++ b/SearchStructures/examples/RangeSegmentTrees/segment_tree_set_2.cpp @@ -11,12 +11,12 @@ #include #include #include -#include +#include #include #include -typedef CGAL::Cartesian Representation; -typedef CGAL::Range_segment_tree_set_traits_2 Traits; +typedef CGAL::Simple_cartesian K; +typedef CGAL::Range_segment_tree_set_traits_2 Traits; typedef CGAL::Segment_tree_2 Segment_tree_2_type; int main() diff --git a/SearchStructures/examples/RangeSegmentTrees/segment_tree_set_3.cpp b/SearchStructures/examples/RangeSegmentTrees/segment_tree_set_3.cpp index 4e674b1dbb2..ae7ec3e8973 100644 --- a/SearchStructures/examples/RangeSegmentTrees/segment_tree_set_3.cpp +++ b/SearchStructures/examples/RangeSegmentTrees/segment_tree_set_3.cpp @@ -6,12 +6,12 @@ #include #include #include -#include +#include #include #include -typedef CGAL::Cartesian Representation; -typedef CGAL::Range_segment_tree_set_traits_3 Traits; +typedef CGAL::Simple_cartesian K; +typedef CGAL::Range_segment_tree_set_traits_3 Traits; typedef CGAL::Segment_tree_3 Segment_tree_3_type; int main()