From 99d960c61326f77b0e875742f3aaf9ccafedff6c Mon Sep 17 00:00:00 2001
From: Guillaume Damiand <guillaume.damiand@liris.cnrs.fr>
Date: Wed, 28 Aug 2019 15:35:57 +0200
Subject: [PATCH] Update face graph wrapper

---
 .../include/CGAL/Combinatorial_map.h          |  2 ++
 .../include/CGAL/Face_graph_wrapper.h         | 25 +++++++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map.h b/Combinatorial_map/include/CGAL/Combinatorial_map.h
index b15f276a108..012e09b600e 100644
--- a/Combinatorial_map/include/CGAL/Combinatorial_map.h
+++ b/Combinatorial_map/include/CGAL/Combinatorial_map.h
@@ -803,6 +803,8 @@ namespace CGAL {
     template<unsigned int dim>
     bool is_opposite_exist(Dart_const_handle ADart) const
     { return !this->template is_free<dim>(ADart); }
+    bool is_border(Dart_handle& ADart)
+    { return false; }// is_border is a method of Polygonal_schema
 
     Dart_handle previous(Dart_handle ADart)
     { return this->template beta<0>(ADart); }
diff --git a/Combinatorial_map/include/CGAL/Face_graph_wrapper.h b/Combinatorial_map/include/CGAL/Face_graph_wrapper.h
index fd008a40b4e..cbe5b0900d3 100644
--- a/Combinatorial_map/include/CGAL/Face_graph_wrapper.h
+++ b/Combinatorial_map/include/CGAL/Face_graph_wrapper.h
@@ -787,6 +787,9 @@ protected:
     typedef Face_graph_wrapper<HEG> type;
     typedef const Face_graph_wrapper<HEG> storage_type;
     Get_map(const HEG& heg): m_map(heg) {}
+    static const HEG& get_mesh(const storage_type& amap)
+    { return amap.get_fg(); }
+
     storage_type m_map;
   };
 
@@ -797,7 +800,9 @@ protected:
     typedef Map type;
     typedef const Map& storage_type;
     Get_map(const Map& heg): m_map(heg) {}
-    storage_type m_map;
+     static const Map& get_mesh(const storage_type& amap)
+    { return amap; }
+   storage_type m_map;
   };
 
   template <unsigned int d, typename Refs, typename Items, typename Alloc,
@@ -807,6 +812,8 @@ protected:
     typedef Map type;
     typedef const Map& storage_type;
     Get_map(const Map& heg): m_map(heg) {}
+    static const Map& get_mesh(const storage_type& amap)
+    { return amap; }
     storage_type m_map;
   };
 
@@ -819,6 +826,8 @@ protected:
     typedef LCC type;
     typedef const LCC& storage_type;
     Get_map(const LCC& heg): m_map(heg) {}
+     static const LCC& get_mesh(const storage_type& amap)
+    { return amap; }
     storage_type m_map;
   };
 
@@ -829,6 +838,8 @@ protected:
     typedef Map type;
     typedef const Map& storage_type;
     Get_map(const Map& heg): m_map(heg) {}
+     static const Map& get_mesh(const storage_type& amap)
+    { return amap; }
     storage_type m_map;
   };
 
@@ -839,7 +850,9 @@ protected:
     typedef Map type;
     typedef const Map& storage_type;
     Get_map(const Map& heg): m_map(heg) {}
-    storage_type m_map;
+     static const Map& get_mesh(const storage_type& amap)
+    { return amap; }
+   storage_type m_map;
   };
 
   template <unsigned int d, typename Items, typename Alloc,
@@ -849,6 +862,8 @@ protected:
     typedef Map type;
     typedef const Map& storage_type;
     Get_map(const Map& heg): m_map(heg) {}
+    static const Map& get_mesh(const storage_type& amap)
+    { return amap; }
     storage_type m_map;
   };
 
@@ -859,6 +874,8 @@ protected:
     typedef Map type;
     typedef const Map& storage_type;
     Get_map(const Map& heg): m_map(heg) {}
+    static const Map& get_mesh(const storage_type& amap)
+    { return amap; }
     storage_type m_map;
   };
 
@@ -872,6 +889,8 @@ protected:
     typedef LCC type;
     typedef const LCC& storage_type;
     Get_map(const LCC& heg): m_map(heg) {}
+    static const LCC& get_mesh(const storage_type& amap)
+    { return amap; }
     storage_type m_map;
   };
 
@@ -885,6 +904,8 @@ protected:
     typedef LCC type;
     typedef const LCC& storage_type;
     Get_map(const LCC& heg): m_map(heg) {}
+    static const LCC& get_mesh(const storage_type& amap)
+    { return amap; }
     storage_type m_map;
   };