From f855546ad1ae19792feec04da169682575141bfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= <sebastien.loriot@cgal.org>
Date: Wed, 15 May 2019 13:00:01 +0200
Subject: [PATCH 1/3] add missing template parameter

---
 AABB_tree/doc/AABB_tree/PackageDescription.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AABB_tree/doc/AABB_tree/PackageDescription.txt b/AABB_tree/doc/AABB_tree/PackageDescription.txt
index e94a561f00a..06b694b2d5a 100644
--- a/AABB_tree/doc/AABB_tree/PackageDescription.txt
+++ b/AABB_tree/doc/AABB_tree/PackageDescription.txt
@@ -36,6 +36,6 @@
 - `CGAL::AABB_triangle_primitive<GeomTraits, Iterator, CacheDatum>`
 - `CGAL::AABB_segment_primitive<GeomTraits, Iterator, CacheDatum>`
 - `CGAL::AABB_primitive<Id,ObjectPropertyMap,PointPropertyMapPolyhedron,ExternalPropertyMaps,CacheDatum>`
-- `CGAL::AABB_halfedge_graph_segment_primitive<HalfedgeGraph,OneHalfedgeGraphPerTree,CacheDatum>`
-- `CGAL::AABB_face_graph_triangle_primitive<FaceGraph,OneFaceGraphPerTree,CacheDatum>`
+- `CGAL::AABB_halfedge_graph_segment_primitive<HalfedgeGraph,Vpm,OneHalfedgeGraphPerTree,CacheDatum>`
+- `CGAL::AABB_face_graph_triangle_primitive<FaceGraph,Vpm,OneFaceGraphPerTree,CacheDatum>`
 */

From f65cc41e82c7bb094a47f537060e765ed21d1e59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= <sebastien.loriot@cgal.org>
Date: Wed, 15 May 2019 13:00:45 +0200
Subject: [PATCH 2/3] add missing default template parameter

---
 Polygon_mesh_processing/include/CGAL/Polygon_mesh_slicer.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_slicer.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_slicer.h
index cda6a7e6c77..0467e2d2013 100644
--- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_slicer.h
+++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_slicer.h
@@ -85,7 +85,7 @@ template<class TriangleMesh,
   class VertexPointMap = typename boost::property_map< TriangleMesh, vertex_point_t>::type,
   class AABBTree = AABB_tree<
                        AABB_traits<Traits,
-                         AABB_halfedge_graph_segment_primitive<TriangleMesh> > >,
+                         AABB_halfedge_graph_segment_primitive<TriangleMesh, VertexPointMap> > >,
   bool UseParallelPlaneOptimization=true>
 class Polygon_mesh_slicer
 {

From dd84321f562cff8632f4b05261cc5ffcfaf17e3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= <sebastien.loriot@cgal.org>
Date: Fri, 17 May 2019 15:01:46 +0200
Subject: [PATCH 3/3] be more backward compatible + add typedef for AABB-tree
 definition

---
 .../include/CGAL/Polygon_mesh_slicer.h              | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_slicer.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_slicer.h
index 0467e2d2013..af853822fde 100644
--- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_slicer.h
+++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_slicer.h
@@ -39,6 +39,8 @@
 #include <CGAL/Polygon_mesh_processing/internal/Polygon_mesh_slicer/Axis_parallel_plane_traits.h>
 
 #include <boost/variant.hpp>
+#include <boost/mpl/if.hpp>
+#include <boost/type_traits/is_same.hpp>
 
 #include <CGAL/boost/graph/split_graph_into_polylines.h>
 
@@ -85,7 +87,13 @@ template<class TriangleMesh,
   class VertexPointMap = typename boost::property_map< TriangleMesh, vertex_point_t>::type,
   class AABBTree = AABB_tree<
                        AABB_traits<Traits,
-                         AABB_halfedge_graph_segment_primitive<TriangleMesh, VertexPointMap> > >,
+                         AABB_halfedge_graph_segment_primitive<TriangleMesh,
+                                                                typename boost::mpl::if_<
+                                                                  typename boost::is_same<
+                                                                    VertexPointMap,
+                                                                    typename boost::property_map< TriangleMesh, vertex_point_t>::type >::type,
+                                                                  Default,
+                                                                  VertexPointMap>::type> > >,
   bool UseParallelPlaneOptimization=true>
 class Polygon_mesh_slicer
 {
@@ -299,6 +307,9 @@ class Polygon_mesh_slicer
 
 public:
 
+  /// the AABB-tree type used internally
+  typedef AABBTree AABB_tree;
+
   /**
   * Constructor using `edges(tmesh)` to initialize the
   * internal `AABB_tree`.