From d0ba5e40a99a7ab8ac984284c1b05980e29b469b Mon Sep 17 00:00:00 2001
From: Andreas Fabri <andreas.fabri@geometryfactory.com>
Date: Thu, 14 Feb 2019 09:44:18 +0100
Subject: [PATCH] AABB_tree, BGL

---
 .../test/AABB_tree/aabb_correctness_triangle_test.cpp  |  3 ---
 AABB_tree/test/AABB_tree/aabb_distance_edge_test.cpp   |  2 --
 .../AABB_tree/aabb_distance_triangle_hint_test.cpp     |  2 --
 BGL/examples/BGL_LCC/incident_vertices_lcc.cpp         |  2 +-
 BGL/examples/BGL_LCC/normals_lcc.cpp                   | 10 ++++------
 BGL/examples/BGL_LCC/range_lcc.cpp                     |  1 +
 BGL/examples/BGL_LCC/transform_iterator_lcc.cpp        |  4 ++--
 BGL/examples/BGL_OpenMesh/TriMesh.cpp                  |  2 --
 BGL/examples/BGL_polyhedron_3/copy_polyhedron.cpp      |  1 +
 BGL/examples/BGL_polyhedron_3/distance.cpp             |  1 -
 BGL/examples/BGL_polyhedron_3/incident_vertices.cpp    |  2 +-
 BGL/examples/BGL_polyhedron_3/normals.cpp              | 10 +++-------
 BGL/examples/BGL_polyhedron_3/range.cpp                |  2 +-
 BGL/examples/BGL_surface_mesh/connected_components.cpp |  1 +
 BGL/examples/BGL_surface_mesh/gwdwg.cpp                |  1 +
 BGL/examples/BGL_surface_mesh/surface_mesh_dual.cpp    |  1 +
 .../BGL_surface_mesh/surface_mesh_partition.cpp        |  2 --
 BGL/examples/BGL_surface_mesh/write_inp.cpp            |  1 +
 18 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/AABB_tree/test/AABB_tree/aabb_correctness_triangle_test.cpp b/AABB_tree/test/AABB_tree/aabb_correctness_triangle_test.cpp
index 8d511bea090..55d2c2628f6 100644
--- a/AABB_tree/test/AABB_tree/aabb_correctness_triangle_test.cpp
+++ b/AABB_tree/test/AABB_tree/aabb_correctness_triangle_test.cpp
@@ -26,9 +26,6 @@
 #include <fstream>
 #include <iostream>
 
-#include <CGAL/Timer.h>
-
-#include <CGAL/Cartesian.h>
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 
diff --git a/AABB_tree/test/AABB_tree/aabb_distance_edge_test.cpp b/AABB_tree/test/AABB_tree/aabb_distance_edge_test.cpp
index 5c3ba4ca6e1..4d896ec3e88 100644
--- a/AABB_tree/test/AABB_tree/aabb_distance_edge_test.cpp
+++ b/AABB_tree/test/AABB_tree/aabb_distance_edge_test.cpp
@@ -25,10 +25,8 @@
 
 #include <iostream>
 #include <fstream>
-#include <CGAL/Timer.h>
 
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/Cartesian.h>
 #include <CGAL/Simple_cartesian.h>
 
 #include <CGAL/AABB_tree.h>
diff --git a/AABB_tree/test/AABB_tree/aabb_distance_triangle_hint_test.cpp b/AABB_tree/test/AABB_tree/aabb_distance_triangle_hint_test.cpp
index 2c8e715276a..a2af69037b8 100644
--- a/AABB_tree/test/AABB_tree/aabb_distance_triangle_hint_test.cpp
+++ b/AABB_tree/test/AABB_tree/aabb_distance_triangle_hint_test.cpp
@@ -28,14 +28,12 @@
 #include <CGAL/Timer.h>
 
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/Cartesian.h>
 #include <CGAL/Simple_cartesian.h>
 
 #include <CGAL/AABB_tree.h>
 #include <CGAL/AABB_traits.h>
 #include <CGAL/Polyhedron_3.h>
 
-
 #include <CGAL/spatial_sort.h>
 
 #include "AABB_test_util.h"
diff --git a/BGL/examples/BGL_LCC/incident_vertices_lcc.cpp b/BGL/examples/BGL_LCC/incident_vertices_lcc.cpp
index 2dcc9bb3699..4c3590b66db 100644
--- a/BGL/examples/BGL_LCC/incident_vertices_lcc.cpp
+++ b/BGL/examples/BGL_LCC/incident_vertices_lcc.cpp
@@ -1,10 +1,10 @@
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/boost/graph/graph_traits_Linear_cell_complex_for_combinatorial_map.h>
 #include <CGAL/boost/graph/iterator.h>
+
 #include <iostream>
 #include <fstream>
 
-
 typedef CGAL::Simple_cartesian<double>              Kernel;
 typedef CGAL::Linear_cell_complex_traits<3, Kernel> LCC_traits;
 
diff --git a/BGL/examples/BGL_LCC/normals_lcc.cpp b/BGL/examples/BGL_LCC/normals_lcc.cpp
index 3f2f4b29687..f66b35526fa 100644
--- a/BGL/examples/BGL_LCC/normals_lcc.cpp
+++ b/BGL/examples/BGL_LCC/normals_lcc.cpp
@@ -3,14 +3,12 @@
 #include <boost/graph/graph_traits.hpp>
 #include <CGAL/property_map.h>
 
-#include <CGAL/basic.h>
-#include <CGAL/Kernel/global_functions.h>
-#include <CGAL/Cartesian.h>
+#include <CGAL/Simple_cartesian.h>
 #include <CGAL/boost/graph/graph_traits_Linear_cell_complex_for_combinatorial_map.h>
 
-typedef CGAL::Cartesian<double> Kernel;
-typedef Kernel::Point_3         Point;
-typedef Kernel::Vector_3        Vector;
+typedef CGAL::Simple_cartesian<double> Kernel;
+typedef Kernel::Point_3                Point;
+typedef Kernel::Vector_3               Vector;
 
 typedef CGAL::Linear_cell_complex_traits<3, Kernel> LCC_traits;
 typedef CGAL::Linear_cell_complex_for_bgl_combinatorial_map_helper
diff --git a/BGL/examples/BGL_LCC/range_lcc.cpp b/BGL/examples/BGL_LCC/range_lcc.cpp
index f52254be8b6..d33676676b4 100644
--- a/BGL/examples/BGL_LCC/range_lcc.cpp
+++ b/BGL/examples/BGL_LCC/range_lcc.cpp
@@ -1,6 +1,7 @@
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Iterator_range.h>
 #include <CGAL/boost/graph/graph_traits_Linear_cell_complex_for_combinatorial_map.h>
+
 #include <boost/foreach.hpp>
 
 #include <iostream>
diff --git a/BGL/examples/BGL_LCC/transform_iterator_lcc.cpp b/BGL/examples/BGL_LCC/transform_iterator_lcc.cpp
index c865ce209b5..ca5cef8e664 100644
--- a/BGL/examples/BGL_LCC/transform_iterator_lcc.cpp
+++ b/BGL/examples/BGL_LCC/transform_iterator_lcc.cpp
@@ -1,10 +1,10 @@
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/boost/graph/graph_traits_Linear_cell_complex_for_combinatorial_map.h>
 #include <CGAL/boost/graph/iterator.h>
-#include <fstream>
-
 #include <CGAL/boost/iterator/transform_iterator.hpp>
+
 #include <algorithm>
+#include <fstream>
 
 typedef CGAL::Simple_cartesian<double>              Kernel;
 typedef CGAL::Linear_cell_complex_traits<3, Kernel> LCC_traits;
diff --git a/BGL/examples/BGL_OpenMesh/TriMesh.cpp b/BGL/examples/BGL_OpenMesh/TriMesh.cpp
index 60a008218db..a5803a51473 100644
--- a/BGL/examples/BGL_OpenMesh/TriMesh.cpp
+++ b/BGL/examples/BGL_OpenMesh/TriMesh.cpp
@@ -1,4 +1,3 @@
-
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 
 #include <OpenMesh/Core/IO/MeshIO.hh>
@@ -9,7 +8,6 @@
 #include <CGAL/boost/graph/Euler_operations.h>
 
 #include <CGAL/mesh_segmentation.h>
-
 #include <CGAL/property_map.h>
 
 #include <iostream>
diff --git a/BGL/examples/BGL_polyhedron_3/copy_polyhedron.cpp b/BGL/examples/BGL_polyhedron_3/copy_polyhedron.cpp
index 5a60cba7406..76aa1235c54 100644
--- a/BGL/examples/BGL_polyhedron_3/copy_polyhedron.cpp
+++ b/BGL/examples/BGL_polyhedron_3/copy_polyhedron.cpp
@@ -15,6 +15,7 @@
 #include <iostream>
 #include <fstream>
 #include <iterator>
+
 #include <boost/unordered_map.hpp>
 
 
diff --git a/BGL/examples/BGL_polyhedron_3/distance.cpp b/BGL/examples/BGL_polyhedron_3/distance.cpp
index 3cfc8e1aa0c..68a8122c294 100644
--- a/BGL/examples/BGL_polyhedron_3/distance.cpp
+++ b/BGL/examples/BGL_polyhedron_3/distance.cpp
@@ -14,7 +14,6 @@ typedef boost::graph_traits<Polyhedron>::vertex_descriptor vertex_descriptor;
 typedef boost::graph_traits<Polyhedron>::vertex_iterator   vertex_iterator;
 
 
-
 int main(int argc, char** argv) {
 
   Polyhedron P;  
diff --git a/BGL/examples/BGL_polyhedron_3/incident_vertices.cpp b/BGL/examples/BGL_polyhedron_3/incident_vertices.cpp
index 4e79d97ca4f..281fd049320 100644
--- a/BGL/examples/BGL_polyhedron_3/incident_vertices.cpp
+++ b/BGL/examples/BGL_polyhedron_3/incident_vertices.cpp
@@ -1,10 +1,10 @@
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Polyhedron_3.h>
 #include <CGAL/boost/graph/iterator.h>
+
 #include <iostream>
 #include <fstream>
 
-
 typedef CGAL::Simple_cartesian<double> Kernel;
 typedef CGAL::Polyhedron_3<Kernel>     Polyhedron;
 
diff --git a/BGL/examples/BGL_polyhedron_3/normals.cpp b/BGL/examples/BGL_polyhedron_3/normals.cpp
index efa95a34f72..ed977de08ba 100644
--- a/BGL/examples/BGL_polyhedron_3/normals.cpp
+++ b/BGL/examples/BGL_polyhedron_3/normals.cpp
@@ -1,17 +1,13 @@
 #include <fstream>
 
 #include <boost/graph/graph_traits.hpp>
-#include <CGAL/property_map.h>
 
-#include <CGAL/basic.h>
-#include <CGAL/Kernel/global_functions.h>
-
-// Polyhedron
-#include <CGAL/Cartesian.h>
+#include <CGAL/Simple_cartesian.h>
 #include <CGAL/Polyhedron_3.h>
 #include <CGAL/Polyhedron_items_with_id_3.h>
+#include <CGAL/property_map.h>
 
-typedef CGAL::Cartesian<double>                                      Kernel;
+typedef CGAL::Simple_cartesian<double>                               Kernel;
 typedef Kernel::Point_3                                              Point;
 typedef Kernel::Vector_3                                             Vector;
 typedef CGAL::Polyhedron_3<Kernel, CGAL::Polyhedron_items_with_id_3> Polyhedron;
diff --git a/BGL/examples/BGL_polyhedron_3/range.cpp b/BGL/examples/BGL_polyhedron_3/range.cpp
index 4e4c11aa2a1..48343cca787 100644
--- a/BGL/examples/BGL_polyhedron_3/range.cpp
+++ b/BGL/examples/BGL_polyhedron_3/range.cpp
@@ -1,8 +1,8 @@
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Polyhedron_3.h>
 #include <CGAL/Iterator_range.h>
-#include <boost/foreach.hpp>
 
+#include <boost/foreach.hpp>
 
 #include <iostream>
 #include <fstream>
diff --git a/BGL/examples/BGL_surface_mesh/connected_components.cpp b/BGL/examples/BGL_surface_mesh/connected_components.cpp
index 9923c25a44a..a3d1f0ea4ba 100644
--- a/BGL/examples/BGL_surface_mesh/connected_components.cpp
+++ b/BGL/examples/BGL_surface_mesh/connected_components.cpp
@@ -1,5 +1,6 @@
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Surface_mesh.h>
+
 #include <iostream>
 #include <fstream>
 
diff --git a/BGL/examples/BGL_surface_mesh/gwdwg.cpp b/BGL/examples/BGL_surface_mesh/gwdwg.cpp
index 07ed87cc639..f9a7228f711 100644
--- a/BGL/examples/BGL_surface_mesh/gwdwg.cpp
+++ b/BGL/examples/BGL_surface_mesh/gwdwg.cpp
@@ -4,6 +4,7 @@
 #include <CGAL/boost/graph/Graph_with_descriptor_with_graph.h>
 #include <CGAL/boost/graph/helpers.h>
 #include <CGAL/boost/graph/Euler_operations.h>
+
 #include <fstream>
 
 typedef CGAL::Simple_cartesian<double> K;
diff --git a/BGL/examples/BGL_surface_mesh/surface_mesh_dual.cpp b/BGL/examples/BGL_surface_mesh/surface_mesh_dual.cpp
index b6940117c83..883b46cf852 100644
--- a/BGL/examples/BGL_surface_mesh/surface_mesh_dual.cpp
+++ b/BGL/examples/BGL_surface_mesh/surface_mesh_dual.cpp
@@ -2,6 +2,7 @@
 #include <CGAL/Surface_mesh.h>
 #include <CGAL/boost/graph/Dual.h>
 #include <CGAL/boost/graph/helpers.h>
+
 #include <iostream>
 #include <fstream>
 
diff --git a/BGL/examples/BGL_surface_mesh/surface_mesh_partition.cpp b/BGL/examples/BGL_surface_mesh/surface_mesh_partition.cpp
index 02aa17f3c17..314d95a7944 100644
--- a/BGL/examples/BGL_surface_mesh/surface_mesh_partition.cpp
+++ b/BGL/examples/BGL_surface_mesh/surface_mesh_partition.cpp
@@ -1,7 +1,5 @@
 #include <CGAL/Simple_cartesian.h>
-
 #include <CGAL/Surface_mesh.h>
-
 #include <CGAL/boost/graph/Face_filtered_graph.h>
 #include <CGAL/boost/graph/partition.h>
 
diff --git a/BGL/examples/BGL_surface_mesh/write_inp.cpp b/BGL/examples/BGL_surface_mesh/write_inp.cpp
index 6011a1c0cd5..0bb624e99c9 100644
--- a/BGL/examples/BGL_surface_mesh/write_inp.cpp
+++ b/BGL/examples/BGL_surface_mesh/write_inp.cpp
@@ -1,6 +1,7 @@
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Surface_mesh.h>
 #include <CGAL/boost/graph/io.h>
+
 #include <iostream>
 #include <fstream>