From b96f6d5ce9e88008dacac539d3b645e9ab871a8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= <sebastien.loriot@cgal.org>
Date: Fri, 10 Jun 2022 09:43:59 +0200
Subject: [PATCH] move is_iterator to type_traits

---
 .../include/CGAL/AABB_halfedge_graph_segment_primitive.h      | 2 +-
 .../include/CGAL/Boolean_set_operations_2/complement.h        | 2 +-
 .../include/CGAL/Boolean_set_operations_2/difference.h        | 2 +-
 .../include/CGAL/Boolean_set_operations_2/do_intersect.h      | 2 +-
 .../include/CGAL/Boolean_set_operations_2/intersection.h      | 2 +-
 .../include/CGAL/Boolean_set_operations_2/join.h              | 2 +-
 .../include/CGAL/Boolean_set_operations_2/oriented_side.h     | 2 +-
 .../CGAL/Boolean_set_operations_2/symmetric_difference.h      | 2 +-
 .../Circular_kernel_3/function_objects_polynomial_sphere.h    | 2 +-
 Convex_hull_3/include/CGAL/convex_hull_3.h                    | 2 +-
 Filtered_kernel/include/CGAL/Lazy.h                           | 2 +-
 Interpolation/include/CGAL/natural_neighbor_coordinates_2.h   | 2 +-
 Interpolation/include/CGAL/regular_neighbor_coordinates_2.h   | 2 +-
 Mesh_3/include/CGAL/Mesh_3/experimental/Facet_patch_id_map.h  | 2 +-
 NewKernel_d/include/CGAL/NewKernel_d/Cartesian_LA_functors.h  | 2 +-
 NewKernel_d/include/CGAL/NewKernel_d/KernelD_converter.h      | 2 +-
 NewKernel_d/include/CGAL/NewKernel_d/Wrapper/Cartesian_wrap.h | 2 +-
 .../include/CGAL/NewKernel_d/function_objects_cartesian.h     | 2 +-
 Point_set_processing_3/include/CGAL/IO/read_las_points.h      | 2 +-
 Point_set_processing_3/include/CGAL/IO/read_off_points.h      | 2 +-
 Point_set_processing_3/include/CGAL/IO/read_xyz_points.h      | 2 +-
 Principal_component_analysis_LGPL/include/CGAL/centroid.h     | 2 +-
 STL_Extension/include/CGAL/{ => type_traits}/is_iterator.h    | 4 ++--
 STL_Extension/test/STL_Extension/test_is_iterator.cpp         | 2 +-
 Stream_support/include/CGAL/IO/PLY/PLY_reader.h               | 2 +-
 Stream_support/include/CGAL/IO/helpers.h                      | 2 +-
 .../include/CGAL/Constrained_Delaunay_triangulation_2.h       | 2 +-
 27 files changed, 28 insertions(+), 28 deletions(-)
 rename STL_Extension/include/CGAL/{ => type_traits}/is_iterator.h (97%)

diff --git a/AABB_tree/include/CGAL/AABB_halfedge_graph_segment_primitive.h b/AABB_tree/include/CGAL/AABB_halfedge_graph_segment_primitive.h
index 89a32644bdf..9a673026409 100644
--- a/AABB_tree/include/CGAL/AABB_halfedge_graph_segment_primitive.h
+++ b/AABB_tree/include/CGAL/AABB_halfedge_graph_segment_primitive.h
@@ -23,7 +23,7 @@
 
 #include <iterator>
 #include <boost/mpl/and.hpp>
-#include <CGAL/is_iterator.h>
+#include <CGAL/type_traits/is_iterator.h>
 #include <boost/type_traits/is_convertible.hpp>
 #include <boost/mpl/if.hpp>
 
diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/complement.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/complement.h
index 076d5dbbbd1..29496049990 100644
--- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/complement.h
+++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/complement.h
@@ -31,7 +31,7 @@
 #include <CGAL/iterator.h>
 #include <CGAL/Boolean_set_operations_2/Bso_internal_functions.h>
 #include <CGAL/Boolean_set_operations_2/Polygon_conversions.h>
-#include <CGAL/is_iterator.h>
+#include <CGAL/type_traits/is_iterator.h>
 
 namespace CGAL
 {
diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/difference.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/difference.h
index d8f570315c9..dba4b1d433a 100644
--- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/difference.h
+++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/difference.h
@@ -31,7 +31,7 @@
 #include <CGAL/iterator.h>
 #include <CGAL/Boolean_set_operations_2/Bso_internal_functions.h>
 #include <CGAL/Boolean_set_operations_2/Polygon_conversions.h>
-#include <CGAL/is_iterator.h>
+#include <CGAL/type_traits/is_iterator.h>
 
 namespace CGAL
 {
diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/do_intersect.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/do_intersect.h
index 3794f2916dd..963d788a758 100644
--- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/do_intersect.h
+++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/do_intersect.h
@@ -31,7 +31,7 @@
 #include <CGAL/iterator.h>
 #include <CGAL/Boolean_set_operations_2/Bso_internal_functions.h>
 #include <CGAL/Boolean_set_operations_2/Polygon_conversions.h>
-#include <CGAL/is_iterator.h>
+#include <CGAL/type_traits/is_iterator.h>
 
 namespace CGAL
 {
diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/intersection.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/intersection.h
index a4b8b8e9e7c..ad0fc8b1ee9 100644
--- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/intersection.h
+++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/intersection.h
@@ -31,7 +31,7 @@
 #include <CGAL/iterator.h>
 #include <CGAL/Boolean_set_operations_2/Bso_internal_functions.h>
 #include <CGAL/Boolean_set_operations_2/Polygon_conversions.h>
-#include <CGAL/is_iterator.h>
+#include <CGAL/type_traits/is_iterator.h>
 
 namespace CGAL
 {
diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/join.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/join.h
index e0bd8e614bc..9ec9ea2527d 100644
--- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/join.h
+++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/join.h
@@ -31,7 +31,7 @@
 #include <CGAL/iterator.h>
 #include <CGAL/Boolean_set_operations_2/Bso_internal_functions.h>
 #include <CGAL/Boolean_set_operations_2/Polygon_conversions.h>
-#include <CGAL/is_iterator.h>
+#include <CGAL/type_traits/is_iterator.h>
 
 namespace CGAL
 {
diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/oriented_side.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/oriented_side.h
index d96963ef942..133ad6fcbae 100644
--- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/oriented_side.h
+++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/oriented_side.h
@@ -31,7 +31,7 @@
 #include <CGAL/iterator.h>
 #include <CGAL/Boolean_set_operations_2/Bso_internal_functions.h>
 #include <CGAL/Boolean_set_operations_2/Polygon_conversions.h>
-#include <CGAL/is_iterator.h>
+#include <CGAL/type_traits/is_iterator.h>
 
 namespace CGAL
 {
diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/symmetric_difference.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/symmetric_difference.h
index 67d85d0074a..dfe0297dcde 100644
--- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/symmetric_difference.h
+++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/symmetric_difference.h
@@ -31,7 +31,7 @@
 #include <CGAL/iterator.h>
 #include <CGAL/Boolean_set_operations_2/Bso_internal_functions.h>
 #include <CGAL/Boolean_set_operations_2/Polygon_conversions.h>
-#include <CGAL/is_iterator.h>
+#include <CGAL/type_traits/is_iterator.h>
 
 namespace CGAL
 {
diff --git a/Circular_kernel_3/include/CGAL/Circular_kernel_3/function_objects_polynomial_sphere.h b/Circular_kernel_3/include/CGAL/Circular_kernel_3/function_objects_polynomial_sphere.h
index 48972182b0c..ff7119586a5 100644
--- a/Circular_kernel_3/include/CGAL/Circular_kernel_3/function_objects_polynomial_sphere.h
+++ b/Circular_kernel_3/include/CGAL/Circular_kernel_3/function_objects_polynomial_sphere.h
@@ -21,7 +21,7 @@
 
 
 #include <CGAL/kernel_basic.h>
-#include <CGAL/is_iterator.h>
+#include <CGAL/type_traits/is_iterator.h>
 
 #include <CGAL/Spherical_kernel_intersections.h>
 #include <CGAL/Circular_kernel_3/internal_functions_on_circular_arc_point_3.h>
diff --git a/Convex_hull_3/include/CGAL/convex_hull_3.h b/Convex_hull_3/include/CGAL/convex_hull_3.h
index 19ce78e6e30..14ac3ef0eb7 100644
--- a/Convex_hull_3/include/CGAL/convex_hull_3.h
+++ b/Convex_hull_3/include/CGAL/convex_hull_3.h
@@ -40,7 +40,7 @@
 #include <CGAL/boost/graph/Euler_operations.h>
 #include <CGAL/boost/iterator/transform_iterator.hpp>
 #include <CGAL/boost/graph/named_params_helper.h>
-#include <CGAL/is_iterator.h>
+#include <CGAL/type_traits/is_iterator.h>
 
 #include <boost/next_prior.hpp>
 #include <boost/type_traits/is_floating_point.hpp>
diff --git a/Filtered_kernel/include/CGAL/Lazy.h b/Filtered_kernel/include/CGAL/Lazy.h
index 5fba1099c35..f01ed3640e8 100644
--- a/Filtered_kernel/include/CGAL/Lazy.h
+++ b/Filtered_kernel/include/CGAL/Lazy.h
@@ -27,7 +27,7 @@
 #include <CGAL/Bbox_3.h>
 #include <CGAL/Default.h>
 #include <CGAL/tss.h>
-#include <CGAL/is_iterator.h>
+#include <CGAL/type_traits/is_iterator.h>
 #include <CGAL/transforming_iterator.h>
 
 #include <boost/optional.hpp>
diff --git a/Interpolation/include/CGAL/natural_neighbor_coordinates_2.h b/Interpolation/include/CGAL/natural_neighbor_coordinates_2.h
index c8646a0bd35..d50116d0938 100644
--- a/Interpolation/include/CGAL/natural_neighbor_coordinates_2.h
+++ b/Interpolation/include/CGAL/natural_neighbor_coordinates_2.h
@@ -17,7 +17,7 @@
 #include <CGAL/Interpolation/internal/helpers.h>
 
 #include <CGAL/function_objects.h>
-#include <CGAL/is_iterator.h>
+#include <CGAL/type_traits/is_iterator.h>
 #include <CGAL/Iterator_project.h>
 #include <CGAL/Polygon_2.h>
 #include <CGAL/number_utils_classes.h>
diff --git a/Interpolation/include/CGAL/regular_neighbor_coordinates_2.h b/Interpolation/include/CGAL/regular_neighbor_coordinates_2.h
index 501c7348357..5f8f93aa1e1 100644
--- a/Interpolation/include/CGAL/regular_neighbor_coordinates_2.h
+++ b/Interpolation/include/CGAL/regular_neighbor_coordinates_2.h
@@ -16,7 +16,7 @@
 
 #include <CGAL/Interpolation/internal/helpers.h>
 
-#include <CGAL/is_iterator.h>
+#include <CGAL/type_traits/is_iterator.h>
 #include <CGAL/iterator.h>
 #include <CGAL/utility.h>
 #include <CGAL/function_objects.h>
diff --git a/Mesh_3/include/CGAL/Mesh_3/experimental/Facet_patch_id_map.h b/Mesh_3/include/CGAL/Mesh_3/experimental/Facet_patch_id_map.h
index 709c0175d2b..bafbeceace6 100644
--- a/Mesh_3/include/CGAL/Mesh_3/experimental/Facet_patch_id_map.h
+++ b/Mesh_3/include/CGAL/Mesh_3/experimental/Facet_patch_id_map.h
@@ -18,7 +18,7 @@
 
 #include <CGAL/property_map.h>
 #include <CGAL/boost/graph/properties.h>
-#include <CGAL/is_iterator.h>
+#include <CGAL/type_traits/is_iterator.h>
 
 namespace CGAL { namespace Mesh_3 {
 
diff --git a/NewKernel_d/include/CGAL/NewKernel_d/Cartesian_LA_functors.h b/NewKernel_d/include/CGAL/NewKernel_d/Cartesian_LA_functors.h
index 77ecdbb99d9..7d6ad589216 100644
--- a/NewKernel_d/include/CGAL/NewKernel_d/Cartesian_LA_functors.h
+++ b/NewKernel_d/include/CGAL/NewKernel_d/Cartesian_LA_functors.h
@@ -13,7 +13,7 @@
 #define CGAL_CARTESIAN_LA_FUNCTORS_H
 
 #include <CGAL/NewKernel_d/utils.h>
-#include <CGAL/is_iterator.h>
+#include <CGAL/type_traits/is_iterator.h>
 #include <CGAL/argument_swaps.h>
 #include <CGAL/Kernel/Return_base_tag.h>
 #include <CGAL/transforming_iterator.h>
diff --git a/NewKernel_d/include/CGAL/NewKernel_d/KernelD_converter.h b/NewKernel_d/include/CGAL/NewKernel_d/KernelD_converter.h
index 11963567107..c1385eb98f7 100644
--- a/NewKernel_d/include/CGAL/NewKernel_d/KernelD_converter.h
+++ b/NewKernel_d/include/CGAL/NewKernel_d/KernelD_converter.h
@@ -21,7 +21,7 @@
 #include <CGAL/NT_converter.h>
 #include <CGAL/NewKernel_d/functor_tags.h>
 #include <CGAL/Kernel/mpl.h>
-#include <CGAL/is_iterator.h>
+#include <CGAL/type_traits/is_iterator.h>
 #include <CGAL/transforming_iterator.h>
 #include <boost/mpl/if.hpp>
 #include <CGAL/NewKernel_d/store_kernel.h>
diff --git a/NewKernel_d/include/CGAL/NewKernel_d/Wrapper/Cartesian_wrap.h b/NewKernel_d/include/CGAL/NewKernel_d/Wrapper/Cartesian_wrap.h
index 8931f747060..af28c8146f9 100644
--- a/NewKernel_d/include/CGAL/NewKernel_d/Wrapper/Cartesian_wrap.h
+++ b/NewKernel_d/include/CGAL/NewKernel_d/Wrapper/Cartesian_wrap.h
@@ -13,7 +13,7 @@
 #define CGAL_KERNEL_D_CARTESIAN_WRAP_H
 
 #include <CGAL/basic.h>
-#include <CGAL/is_iterator.h>
+#include <CGAL/type_traits/is_iterator.h>
 
 #if defined(BOOST_MSVC)
 #  pragma warning(push)
diff --git a/NewKernel_d/include/CGAL/NewKernel_d/function_objects_cartesian.h b/NewKernel_d/include/CGAL/NewKernel_d/function_objects_cartesian.h
index 744031dab8c..de6ec3fb91c 100644
--- a/NewKernel_d/include/CGAL/NewKernel_d/function_objects_cartesian.h
+++ b/NewKernel_d/include/CGAL/NewKernel_d/function_objects_cartesian.h
@@ -16,7 +16,7 @@
 #include <CGAL/Dimension.h>
 #include <CGAL/Uncertain.h>
 #include <CGAL/NewKernel_d/store_kernel.h>
-#include <CGAL/is_iterator.h>
+#include <CGAL/type_traits/is_iterator.h>
 #include <CGAL/iterator_from_indices.h>
 #include <CGAL/number_utils.h>
 #include <CGAL/Kernel/Return_base_tag.h>
diff --git a/Point_set_processing_3/include/CGAL/IO/read_las_points.h b/Point_set_processing_3/include/CGAL/IO/read_las_points.h
index cff4b26c537..4d0d99a7eb5 100644
--- a/Point_set_processing_3/include/CGAL/IO/read_las_points.h
+++ b/Point_set_processing_3/include/CGAL/IO/read_las_points.h
@@ -23,7 +23,7 @@
 
 #include <CGAL/Named_function_parameters.h>
 #include <CGAL/boost/graph/named_params_helper.h>
-#include <CGAL/is_iterator.h>
+#include <CGAL/type_traits/is_iterator.h>
 
 #include <boost/version.hpp>
 #include <boost/cstdint.hpp>
diff --git a/Point_set_processing_3/include/CGAL/IO/read_off_points.h b/Point_set_processing_3/include/CGAL/IO/read_off_points.h
index 0102882f758..f91dc45fbc0 100644
--- a/Point_set_processing_3/include/CGAL/IO/read_off_points.h
+++ b/Point_set_processing_3/include/CGAL/IO/read_off_points.h
@@ -21,7 +21,7 @@
 #include <CGAL/point_set_processing_assertions.h>
 #include <CGAL/Kernel_traits.h>
 #include <CGAL/iterator.h>
-#include <CGAL/is_iterator.h>
+#include <CGAL/type_traits/is_iterator.h>
 
 #include <CGAL/Named_function_parameters.h>
 #include <CGAL/boost/graph/named_params_helper.h>
diff --git a/Point_set_processing_3/include/CGAL/IO/read_xyz_points.h b/Point_set_processing_3/include/CGAL/IO/read_xyz_points.h
index 812ec3058e6..7521550be66 100644
--- a/Point_set_processing_3/include/CGAL/IO/read_xyz_points.h
+++ b/Point_set_processing_3/include/CGAL/IO/read_xyz_points.h
@@ -19,7 +19,7 @@
 #include <CGAL/point_set_processing_assertions.h>
 #include <CGAL/Origin.h>
 #include <CGAL/Kernel_traits.h>
-#include <CGAL/is_iterator.h>
+#include <CGAL/type_traits/is_iterator.h>
 
 #include <CGAL/Named_function_parameters.h>
 #include <CGAL/boost/graph/named_params_helper.h>
diff --git a/Principal_component_analysis_LGPL/include/CGAL/centroid.h b/Principal_component_analysis_LGPL/include/CGAL/centroid.h
index 64315ae8c2e..b02a618a639 100644
--- a/Principal_component_analysis_LGPL/include/CGAL/centroid.h
+++ b/Principal_component_analysis_LGPL/include/CGAL/centroid.h
@@ -20,7 +20,7 @@
 #include <CGAL/Origin.h>
 #include <CGAL/Kernel/global_functions.h>
 
-#include <CGAL/is_iterator.h>
+#include <CGAL/type_traits/is_iterator.h>
 #include <boost/utility.hpp>
 
 #include <iterator>
diff --git a/STL_Extension/include/CGAL/is_iterator.h b/STL_Extension/include/CGAL/type_traits/is_iterator.h
similarity index 97%
rename from STL_Extension/include/CGAL/is_iterator.h
rename to STL_Extension/include/CGAL/type_traits/is_iterator.h
index e46eb4cf1d0..f8010ab35b3 100644
--- a/STL_Extension/include/CGAL/is_iterator.h
+++ b/STL_Extension/include/CGAL/type_traits/is_iterator.h
@@ -14,8 +14,8 @@
 // Author(s)     : Marc Glisse
 
 
-#ifndef CGAL_IS_ITERATOR_H
-#define CGAL_IS_ITERATOR_H
+#ifndef CGAL_TYPE_TRAITS_IS_ITERATOR_H
+#define CGAL_TYPE_TRAITS_IS_ITERATOR_H
 
 #include <boost/type_traits/is_convertible.hpp>
 #include <boost/type_traits/is_pointer.hpp>
diff --git a/STL_Extension/test/STL_Extension/test_is_iterator.cpp b/STL_Extension/test/STL_Extension/test_is_iterator.cpp
index c6412282935..7305fe62da0 100644
--- a/STL_Extension/test/STL_Extension/test_is_iterator.cpp
+++ b/STL_Extension/test/STL_Extension/test_is_iterator.cpp
@@ -1,5 +1,5 @@
 #include <CGAL/assertions.h>
-#include <CGAL/is_iterator.h>
+#include <CGAL/type_traits/is_iterator.h>
 #include <CGAL/use.h>
 #include <vector>
 #include <list>
diff --git a/Stream_support/include/CGAL/IO/PLY/PLY_reader.h b/Stream_support/include/CGAL/IO/PLY/PLY_reader.h
index 26876409a48..2500bb8f59b 100644
--- a/Stream_support/include/CGAL/IO/PLY/PLY_reader.h
+++ b/Stream_support/include/CGAL/IO/PLY/PLY_reader.h
@@ -13,7 +13,7 @@
 
 #include <CGAL/Container_helper.h>
 #include <CGAL/IO/io.h>
-#include <CGAL/is_iterator.h>
+#include <CGAL/type_traits/is_iterator.h>
 #include <CGAL/Kernel_traits.h>
 #include <CGAL/property_map.h>
 
diff --git a/Stream_support/include/CGAL/IO/helpers.h b/Stream_support/include/CGAL/IO/helpers.h
index 98830e089c8..2331e0314a1 100644
--- a/Stream_support/include/CGAL/IO/helpers.h
+++ b/Stream_support/include/CGAL/IO/helpers.h
@@ -16,7 +16,7 @@
 #include <CGAL/Container_helper.h>
 #include <CGAL/Has_member.h>
 #include <CGAL/Point_3.h>
-#include <CGAL/is_iterator.h>
+#include <CGAL/type_traits/is_iterator.h>
 
 #include <boost/mpl/logical.hpp>
 #include <boost/mpl/has_xxx.hpp>
diff --git a/Triangulation_2/include/CGAL/Constrained_Delaunay_triangulation_2.h b/Triangulation_2/include/CGAL/Constrained_Delaunay_triangulation_2.h
index 3ca48aafd90..d96c746a548 100644
--- a/Triangulation_2/include/CGAL/Constrained_Delaunay_triangulation_2.h
+++ b/Triangulation_2/include/CGAL/Constrained_Delaunay_triangulation_2.h
@@ -23,7 +23,7 @@
 #ifndef CGAL_TRIANGULATION_2_DONT_INSERT_RANGE_OF_POINTS_WITH_INFO
 #include <CGAL/Spatial_sort_traits_adapter_2.h>
 #include <CGAL/STL_Extension/internal/info_check.h>
-#include <CGAL/is_iterator.h>
+#include <CGAL/type_traits/is_iterator.h>
 
 #include <boost/container/flat_set.hpp>
 #include <boost/iterator/zip_iterator.hpp>