From 74b8ddf1ec73283e89b5fd7d2789ee1cc03d7af7 Mon Sep 17 00:00:00 2001
From: Andreas Fabri <andreas.fabri@geometryfactory.com>
Date: Wed, 28 Jun 2023 11:42:55 +0100
Subject: [PATCH] Fix ToS_2

---
 .../include/CGAL/Triangulation_on_sphere_2.h                | 4 ++--
 .../test/Triangulation_on_sphere_2/test_dtos.cpp            | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Triangulation_on_sphere_2/include/CGAL/Triangulation_on_sphere_2.h b/Triangulation_on_sphere_2/include/CGAL/Triangulation_on_sphere_2.h
index 8b3fb4f448e..57f8117a7f2 100644
--- a/Triangulation_on_sphere_2/include/CGAL/Triangulation_on_sphere_2.h
+++ b/Triangulation_on_sphere_2/include/CGAL/Triangulation_on_sphere_2.h
@@ -275,7 +275,7 @@ public:
   // solid edges: both incident faces are solid
   typedef Filter_iterator<All_edges_iterator, Ghost_tester>          Solid_edges_iterator;
   typedef Iterator_range<Solid_edges_iterator>                       Solid_edges;
-  typedef Iterator_range<Prevent_deref<Solid_faces_iterator> >       Solid_face_handles;
+  typedef Iterator_range<Prevent_deref<Solid_faces_iterator, Face_handle> > Solid_face_handles;
 
   typedef Project_point<Vertex>                                      Pt_proj;
   typedef boost::transform_iterator<Pt_proj, Vertices_iterator>      Point_iterator;
@@ -321,7 +321,7 @@ public:
 
   Solid_face_handles solid_faces() const
   {
-    return make_prevent_deref_range(solid_faces_begin(), solid_faces_end());
+      return { solid_faces_begin(), solid_faces_end() };
   }
 
   Solid_edges_iterator solid_edges_begin() const
diff --git a/Triangulation_on_sphere_2/test/Triangulation_on_sphere_2/test_dtos.cpp b/Triangulation_on_sphere_2/test/Triangulation_on_sphere_2/test_dtos.cpp
index e3c66570792..06f8ce3c290 100644
--- a/Triangulation_on_sphere_2/test/Triangulation_on_sphere_2/test_dtos.cpp
+++ b/Triangulation_on_sphere_2/test/Triangulation_on_sphere_2/test_dtos.cpp
@@ -98,6 +98,12 @@ int main(int, char**)
   assert(sfs.size() == 4);
   assert(tr.number_of_solid_faces() + tr.number_of_ghost_faces() == tr.number_of_faces());
 
+  Tr::Face_handle fh = *tr.solid_faces().begin();
+  for(auto f: tr.solid_faces()) {
+    assert(f == fh);
+    break;
+  }
+
   Tr::Points pts = tr.points();
   assert(pts.size() == tr.number_of_vertices() && pts.size() == 5);