From 1e7b9ea027e065393feb98e10050146facbca93f Mon Sep 17 00:00:00 2001
From: Simon Giraudot <simon.giraudot@geometryfactory.com>
Date: Fri, 29 Sep 2017 14:20:29 +0200
Subject: [PATCH] Fix counting iterator warnings

---
 .../include/CGAL/graph_traits_Arrangement_2.h                   | 2 +-
 .../include/CGAL/graph_traits_Dual_Arrangement_2.h              | 2 +-
 Convex_hull_2/test/Convex_hull_2/ch2_point_with_info.cpp        | 2 +-
 NewKernel_d/include/CGAL/NewKernel_d/Types/Hyperplane.h         | 2 +-
 NewKernel_d/include/CGAL/NewKernel_d/Types/Sphere.h             | 2 +-
 NewKernel_d/include/CGAL/NewKernel_d/Types/Weighted_point.h     | 2 +-
 .../include/CGAL/Shape_detection_3/Efficient_RANSAC.h           | 2 +-
 Polyhedron/demo/Polyhedron/Plugins/PMP/Distance_plugin.cpp      | 2 +-
 .../include/CGAL/Segment_Delaunay_graph_2.h                     | 2 +-
 .../include/CGAL/Segment_Delaunay_graph_Linf_2.h                | 2 +-
 .../Spatial_searching/nearest_neighbor_searching_inplace_50.cpp | 2 +-
 .../searching_with_point_with_info_inplace.cpp                  | 2 +-
 .../Spatial_searching/searching_with_point_with_info_pmap.cpp   | 2 +-
 .../examples/Spatial_sorting/sp_sort_using_property_map_3.cpp   | 2 +-
 .../examples/Spatial_sorting/sp_sort_using_property_map_d.cpp   | 2 +-
 .../include/CGAL/Triangulation_2/insert_constraints.h           | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Arrangement_on_surface_2/include/CGAL/graph_traits_Arrangement_2.h b/Arrangement_on_surface_2/include/CGAL/graph_traits_Arrangement_2.h
index 43514d81c53..c8abefd0943 100644
--- a/Arrangement_on_surface_2/include/CGAL/graph_traits_Arrangement_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/graph_traits_Arrangement_2.h
@@ -33,7 +33,7 @@
 #include <CGAL/boost/graph/named_function_params.h>
 
 #include <boost/graph/graph_concepts.hpp>
-#include <boost/iterator/counting_iterator.hpp>
+#include <CGAL/boost/iterator/counting_iterator.hpp>
 #include <CGAL/Arrangement_on_surface_2.h>
 #include <CGAL/Arrangement_2.h>
 #include <CGAL/Arr_accessor.h>
diff --git a/Arrangement_on_surface_2/include/CGAL/graph_traits_Dual_Arrangement_2.h b/Arrangement_on_surface_2/include/CGAL/graph_traits_Dual_Arrangement_2.h
index 802de14fd7d..ddb296c7a22 100644
--- a/Arrangement_on_surface_2/include/CGAL/graph_traits_Dual_Arrangement_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/graph_traits_Dual_Arrangement_2.h
@@ -425,7 +425,7 @@ public:
 } //namespace CGAL
 
 #include <boost/graph/graph_concepts.hpp>
-#include <boost/iterator/counting_iterator.hpp>
+#include <CGAL/boost/iterator/counting_iterator.hpp>
 
 namespace boost {
 
diff --git a/Convex_hull_2/test/Convex_hull_2/ch2_point_with_info.cpp b/Convex_hull_2/test/Convex_hull_2/ch2_point_with_info.cpp
index 980dfbed2d7..6058b2c0955 100644
--- a/Convex_hull_2/test/Convex_hull_2/ch2_point_with_info.cpp
+++ b/Convex_hull_2/test/Convex_hull_2/ch2_point_with_info.cpp
@@ -2,7 +2,7 @@
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/convex_hull_2.h>
 #include <CGAL/convex_hull_traits_2.h>
-#include <boost/iterator/counting_iterator.hpp>
+#include <CGAL/boost/iterator/counting_iterator.hpp>
 
 #include <boost/foreach.hpp>
 
diff --git a/NewKernel_d/include/CGAL/NewKernel_d/Types/Hyperplane.h b/NewKernel_d/include/CGAL/NewKernel_d/Types/Hyperplane.h
index 14e35b01d9b..ee3d0b913df 100644
--- a/NewKernel_d/include/CGAL/NewKernel_d/Types/Hyperplane.h
+++ b/NewKernel_d/include/CGAL/NewKernel_d/Types/Hyperplane.h
@@ -23,7 +23,7 @@
 #include <CGAL/number_utils.h>
 #include <CGAL/NewKernel_d/store_kernel.h>
 #include <boost/iterator/transform_iterator.hpp>
-#include <boost/iterator/counting_iterator.hpp>
+#include <CGAL/boost/iterator/counting_iterator.hpp>
 namespace CGAL {
 template <class R_> class Hyperplane {
 	typedef typename Get_type<R_, FT_tag>::type FT_;
diff --git a/NewKernel_d/include/CGAL/NewKernel_d/Types/Sphere.h b/NewKernel_d/include/CGAL/NewKernel_d/Types/Sphere.h
index 114410b4e76..b6b7adb35d3 100644
--- a/NewKernel_d/include/CGAL/NewKernel_d/Types/Sphere.h
+++ b/NewKernel_d/include/CGAL/NewKernel_d/Types/Sphere.h
@@ -20,7 +20,7 @@
 #ifndef CGAL_KD_TYPE_SPHERE_H
 #define CGAL_KD_TYPE_SPHERE_H
 #include <CGAL/NewKernel_d/store_kernel.h>
-#include <boost/iterator/counting_iterator.hpp>
+#include <CGAL/boost/iterator/counting_iterator.hpp>
 namespace CGAL {
 template <class R_> class Sphere {
 	typedef typename Get_type<R_, FT_tag>::type FT_;
diff --git a/NewKernel_d/include/CGAL/NewKernel_d/Types/Weighted_point.h b/NewKernel_d/include/CGAL/NewKernel_d/Types/Weighted_point.h
index 1caf8701496..7335f2d9a56 100644
--- a/NewKernel_d/include/CGAL/NewKernel_d/Types/Weighted_point.h
+++ b/NewKernel_d/include/CGAL/NewKernel_d/Types/Weighted_point.h
@@ -20,7 +20,7 @@
 #ifndef CGAL_KD_TYPE_WP_H
 #define CGAL_KD_TYPE_WP_H
 #include <CGAL/NewKernel_d/store_kernel.h>
-#include <boost/iterator/counting_iterator.hpp>
+#include <CGAL/boost/iterator/counting_iterator.hpp>
 namespace CGAL {
 namespace KerD {
 template <class R_> class Weighted_point {
diff --git a/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Efficient_RANSAC.h b/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Efficient_RANSAC.h
index dc389ba3fc8..724cb7987ee 100644
--- a/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Efficient_RANSAC.h
+++ b/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Efficient_RANSAC.h
@@ -42,7 +42,7 @@
 #include <sstream>
 
 //boost --------------
-#include <boost/iterator/counting_iterator.hpp>
+#include <CGAL/boost/iterator/counting_iterator.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/make_shared.hpp>
 //---------------------
diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Distance_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PMP/Distance_plugin.cpp
index e84c3ca6907..e4eb695ebd4 100644
--- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Distance_plugin.cpp
+++ b/Polyhedron/demo/Polyhedron/Plugins/PMP/Distance_plugin.cpp
@@ -20,7 +20,7 @@
 #include <CGAL/Polygon_mesh_processing/bbox.h>
 #include <CGAL/Polygon_mesh_processing/distance.h>
 #include <CGAL/Polygon_mesh_processing/compute_normal.h>
-#include <boost/iterator/counting_iterator.hpp>
+#include <CGAL/boost/iterator/counting_iterator.hpp>
 #include <CGAL/Search_traits_3.h>
 #include <CGAL/Spatial_sort_traits_adapter_3.h>
 #include <CGAL/property_map.h>
diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2.h
index 9c8bbf3bd41..9ec122439e5 100644
--- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2.h
+++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2.h
@@ -55,7 +55,7 @@
 
 #include <CGAL/assertions.h>
 
-#include <boost/iterator/counting_iterator.hpp>
+#include <CGAL/boost/iterator/counting_iterator.hpp>
 #include <boost/iterator/transform_iterator.hpp>
 
 /*
diff --git a/Segment_Delaunay_graph_Linf_2/include/CGAL/Segment_Delaunay_graph_Linf_2.h b/Segment_Delaunay_graph_Linf_2/include/CGAL/Segment_Delaunay_graph_Linf_2.h
index 1d5769efc9b..4eadb6e04c2 100644
--- a/Segment_Delaunay_graph_Linf_2/include/CGAL/Segment_Delaunay_graph_Linf_2.h
+++ b/Segment_Delaunay_graph_Linf_2/include/CGAL/Segment_Delaunay_graph_Linf_2.h
@@ -54,7 +54,7 @@
 #include <CGAL/spatial_sort.h>
 #include <CGAL/Spatial_sort_traits_adapter_2.h>
 
-#include <boost/iterator/counting_iterator.hpp>
+#include <CGAL/boost/iterator/counting_iterator.hpp>
 
 /*
   Conventions:
diff --git a/Spatial_searching/benchmark/Spatial_searching/nearest_neighbor_searching_inplace_50.cpp b/Spatial_searching/benchmark/Spatial_searching/nearest_neighbor_searching_inplace_50.cpp
index fef44a9cd91..b03bcb26622 100644
--- a/Spatial_searching/benchmark/Spatial_searching/nearest_neighbor_searching_inplace_50.cpp
+++ b/Spatial_searching/benchmark/Spatial_searching/nearest_neighbor_searching_inplace_50.cpp
@@ -7,7 +7,7 @@
 #include <cmath>
 #include <iostream>
 #include <fstream>
-#include <boost/iterator/counting_iterator.hpp>
+#include <CGAL/boost/iterator/counting_iterator.hpp>
 
 
 typedef CGAL::Simple_cartesian<double> Kernel;
diff --git a/Spatial_searching/examples/Spatial_searching/searching_with_point_with_info_inplace.cpp b/Spatial_searching/examples/Spatial_searching/searching_with_point_with_info_inplace.cpp
index 6d761cac759..4f987c1ac45 100644
--- a/Spatial_searching/examples/Spatial_searching/searching_with_point_with_info_inplace.cpp
+++ b/Spatial_searching/examples/Spatial_searching/searching_with_point_with_info_inplace.cpp
@@ -3,7 +3,7 @@
 #include <CGAL/Search_traits_adapter.h>
 #include <CGAL/point_generators_3.h>
 #include <CGAL/Orthogonal_k_neighbor_search.h>
-#include <boost/iterator/counting_iterator.hpp>
+#include <CGAL/boost/iterator/counting_iterator.hpp>
 #include <utility>
 
 typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel;
diff --git a/Spatial_searching/examples/Spatial_searching/searching_with_point_with_info_pmap.cpp b/Spatial_searching/examples/Spatial_searching/searching_with_point_with_info_pmap.cpp
index 8b51fd19b8e..e0ed7bcc39d 100644
--- a/Spatial_searching/examples/Spatial_searching/searching_with_point_with_info_pmap.cpp
+++ b/Spatial_searching/examples/Spatial_searching/searching_with_point_with_info_pmap.cpp
@@ -3,7 +3,7 @@
 #include <CGAL/Search_traits_adapter.h>
 #include <CGAL/point_generators_3.h>
 #include <CGAL/Orthogonal_k_neighbor_search.h>
-#include <boost/iterator/counting_iterator.hpp>
+#include <CGAL/boost/iterator/counting_iterator.hpp>
 #include <utility>
 
 typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel;
diff --git a/Spatial_sorting/examples/Spatial_sorting/sp_sort_using_property_map_3.cpp b/Spatial_sorting/examples/Spatial_sorting/sp_sort_using_property_map_3.cpp
index fdda1a6daae..2e6a6b881fe 100644
--- a/Spatial_sorting/examples/Spatial_sorting/sp_sort_using_property_map_3.cpp
+++ b/Spatial_sorting/examples/Spatial_sorting/sp_sort_using_property_map_3.cpp
@@ -2,7 +2,7 @@
 #include <CGAL/spatial_sort.h>
 #include <CGAL/Spatial_sort_traits_adapter_3.h>
 #include <vector>
-#include <boost/iterator/counting_iterator.hpp>
+#include <CGAL/boost/iterator/counting_iterator.hpp>
 
 typedef CGAL::Simple_cartesian<double>                  Kernel;
 typedef Kernel::Point_3                                 Point_3;
diff --git a/Spatial_sorting/examples/Spatial_sorting/sp_sort_using_property_map_d.cpp b/Spatial_sorting/examples/Spatial_sorting/sp_sort_using_property_map_d.cpp
index 64aa5fdf48f..f3261760032 100644
--- a/Spatial_sorting/examples/Spatial_sorting/sp_sort_using_property_map_d.cpp
+++ b/Spatial_sorting/examples/Spatial_sorting/sp_sort_using_property_map_d.cpp
@@ -1,7 +1,7 @@
 #include <CGAL/Cartesian_d.h>
 #include <CGAL/spatial_sort.h>
 #include <CGAL/Spatial_sort_traits_adapter_d.h>
-#include <boost/iterator/counting_iterator.hpp>
+#include <CGAL/boost/iterator/counting_iterator.hpp>
 #include <vector>
 
 typedef CGAL::Cartesian_d<double>           Kernel;
diff --git a/Triangulation_2/include/CGAL/Triangulation_2/insert_constraints.h b/Triangulation_2/include/CGAL/Triangulation_2/insert_constraints.h
index 18a295eaeb3..3a1bc3efc25 100644
--- a/Triangulation_2/include/CGAL/Triangulation_2/insert_constraints.h
+++ b/Triangulation_2/include/CGAL/Triangulation_2/insert_constraints.h
@@ -26,7 +26,7 @@
 
 #include <CGAL/Spatial_sort_traits_adapter_2.h>
 #include <CGAL/property_map.h>
-#include <boost/iterator/counting_iterator.hpp>
+#include <CGAL/boost/iterator/counting_iterator.hpp>
 #include <vector>
 #include <iterator>