From 835605a06d509c5bbb63ae2934e99600ad540eac Mon Sep 17 00:00:00 2001
From: Andreas Fabri <andreas.fabri@geometryfactory.com>
Date: Tue, 6 Sep 2016 18:10:24 +0200
Subject: [PATCH 1/3] Do not include a header file that is not used

---
 Triangulation_2/include/CGAL/Constraint_hierarchy_2.h          | 1 -
 Triangulation_2/include/CGAL/Polyline_constraint_hierarchy_2.h | 1 -
 2 files changed, 2 deletions(-)

diff --git a/Triangulation_2/include/CGAL/Constraint_hierarchy_2.h b/Triangulation_2/include/CGAL/Constraint_hierarchy_2.h
index 521f54f8c9d..45e864b1013 100644
--- a/Triangulation_2/include/CGAL/Constraint_hierarchy_2.h
+++ b/Triangulation_2/include/CGAL/Constraint_hierarchy_2.h
@@ -25,7 +25,6 @@
 #include <utility>
 #include <map> 
 #include <list> 
-#include <CGAL/Iterator_project.h>
 #include <CGAL/triangulation_assertions.h>
 
 namespace CGAL {
diff --git a/Triangulation_2/include/CGAL/Polyline_constraint_hierarchy_2.h b/Triangulation_2/include/CGAL/Polyline_constraint_hierarchy_2.h
index aa6cf4c2998..d0dbfd0d257 100644
--- a/Triangulation_2/include/CGAL/Polyline_constraint_hierarchy_2.h
+++ b/Triangulation_2/include/CGAL/Polyline_constraint_hierarchy_2.h
@@ -27,7 +27,6 @@
 #include <set> 
 #include <list> 
 #include <CGAL/Skiplist.h>
-#include <CGAL/Iterator_project.h>
 #include <CGAL/triangulation_assertions.h>
 
 namespace CGAL {

From 77f2f7f992886c26ad47c3b37951b2231ce114b9 Mon Sep 17 00:00:00 2001
From: Andreas Fabri <andreas.fabri@geometryfactory.com>
Date: Tue, 6 Sep 2016 18:43:56 +0200
Subject: [PATCH 2/3] Use transform_iterator

---
 Triangulation_2/include/CGAL/Triangulation_2.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Triangulation_2/include/CGAL/Triangulation_2.h b/Triangulation_2/include/CGAL/Triangulation_2.h
index 2ee47f2f4ee..a26ad4d8a29 100644
--- a/Triangulation_2/include/CGAL/Triangulation_2.h
+++ b/Triangulation_2/include/CGAL/Triangulation_2.h
@@ -29,7 +29,7 @@
 #include <iostream>
 
 #include <CGAL/iterator.h>
-#include <CGAL/Iterator_project.h>
+//#include <CGAL/Iterator_project.h>
 #include <CGAL/function_objects.h>
 
 #include <CGAL/triangulation_assertions.h>
@@ -44,6 +44,7 @@
 #include <boost/random/linear_congruential.hpp>
 #include <boost/random/uniform_smallint.hpp>
 #include <boost/random/variate_generator.hpp>
+#include <boost/iterator/transform_iterator.hpp>
 
 #ifndef CGAL_NO_STRUCTURAL_FILTERING
 #include <CGAL/internal/Static_filters/tools.h>
@@ -194,13 +195,15 @@ public:
   // Auxiliary iterators for convenience
   // do not use default template argument to please VC++
   typedef Project_point<Vertex>                           Proj_point;
+  /*
   typedef Iterator_project<Finite_vertices_iterator, 
                            Proj_point,
 	                   const Point&, 
                            const Point*,
                            std::ptrdiff_t,
                            std::bidirectional_iterator_tag>  Point_iterator;
-
+  */
+  typedef boost::transform_iterator<Proj_point,Finite_vertices_iterator> Point_iterator; 
   typedef Point                value_type; // to have a back_inserter
   typedef const value_type&    const_reference; 
   typedef value_type&          reference;

From ef00da9bc878acc3090e15289b8d5162f3cd5e1c Mon Sep 17 00:00:00 2001
From: Andreas Fabri <andreas.fabri@geometryfactory.com>
Date: Tue, 6 Sep 2016 23:04:58 +0200
Subject: [PATCH 3/3] remove commented code

---
 Triangulation_2/include/CGAL/Triangulation_2.h | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/Triangulation_2/include/CGAL/Triangulation_2.h b/Triangulation_2/include/CGAL/Triangulation_2.h
index a26ad4d8a29..b6e7860d352 100644
--- a/Triangulation_2/include/CGAL/Triangulation_2.h
+++ b/Triangulation_2/include/CGAL/Triangulation_2.h
@@ -29,7 +29,6 @@
 #include <iostream>
 
 #include <CGAL/iterator.h>
-//#include <CGAL/Iterator_project.h>
 #include <CGAL/function_objects.h>
 
 #include <CGAL/triangulation_assertions.h>
@@ -195,14 +194,7 @@ public:
   // Auxiliary iterators for convenience
   // do not use default template argument to please VC++
   typedef Project_point<Vertex>                           Proj_point;
-  /*
-  typedef Iterator_project<Finite_vertices_iterator, 
-                           Proj_point,
-	                   const Point&, 
-                           const Point*,
-                           std::ptrdiff_t,
-                           std::bidirectional_iterator_tag>  Point_iterator;
-  */
+
   typedef boost::transform_iterator<Proj_point,Finite_vertices_iterator> Point_iterator; 
   typedef Point                value_type; // to have a back_inserter
   typedef const value_type&    const_reference;