From 9d2670f017601dacf08181c165ee9cf919c27d4e Mon Sep 17 00:00:00 2001
From: Giles Bathgate <giles.bathgate@blueprism.com>
Date: Sun, 25 Aug 2024 18:58:24 +0100
Subject: [PATCH 1/3] Remove commented out code

---
 .../External_structure_builder.h              | 47 -------------------
 1 file changed, 47 deletions(-)

diff --git a/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/External_structure_builder.h b/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/External_structure_builder.h
index 8c4c546590d4..7bbf805248b5 100644
--- a/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/External_structure_builder.h
+++ b/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/External_structure_builder.h
@@ -77,51 +77,7 @@ class External_structure_builder : public Modifier_base<typename Nef_::SNC_and_P
     SNC_structure* sncp(sncpl.sncp);
     SNC_point_locator* pl(sncpl.pl);
 
-
-
     Unique_hash_map<SHalfedge_handle, SFace_handle> sedge2sface;
-    /*
-    SFace_iterator sfi;
-    CGAL_forall_sfaces(sfi, *sncp) {
-      SFace_cycle_iterator sfc;
-      for(sfc = sfi->sface_cycles_begin(); sfc != sfi->sface_cycles_end(); ++sfc) {
-        if(sfc.is_shalfedge()){
-          SHalfedge_around_sface_circulator eaf(sfc), end(eaf);
-          CGAL_For_all(eaf,end) {
-            SHalfedge_handle se(eaf);
-            sedge2sface[eaf] = sfi;
-          }
-        }
-      }
-    }
-
-    //    CGAL::SNC_io_parser<SNC_structure> O0(std::cerr, *sncp, false);
-    //    O0.print();
-
-    SHalfedge_iterator sei;
-    CGAL_forall_shalfedges(sei, *sncp) {
-      SHalfedge_handle se(sei);
-      if(sedge2sface[se] == SFace_handle()) {
-        SM_decorator SD(&*sei->source()->source());
-        SFace_handle sf_new = SD.new_sface();
-        sf_new->mark() = sei->incident_sface()->mark();
-
-        CGAL_NEF_TRACEN("new entry sedge " << sei->source()->point()
-                        << "->" << sei->twin()->source()->point()
-                        << " at " << sei->source()->source()->point());
-
-        SD.link_as_face_cycle(sei, sf_new);
-
-        SHalfedge_around_sface_circulator eaf(se), end(eaf);
-        CGAL_For_all(eaf,end) {
-          SHalfedge_handle se(eaf);
-          sedge2sface[eaf] = sf_new;
-        }
-
-        // TODO: relink inner sface cycles
-      }
-    }
-    */
     SNC_point_locator* old_pl = pl;
     pl = pl->clone();
     sncpl.pl = pl;
@@ -129,9 +85,6 @@ class External_structure_builder : public Modifier_base<typename Nef_::SNC_and_P
     SNC_external_structure C(*sncp,pl);
     C.clear_external_structure();
     C.build_external_structure();
-
-    //    CGAL::SNC_io_parser<SNC_structure> Ox(std::cerr, *sncp, false);
-    //    Ox.print();
   }
 };
 

From 44b92c11dbe57e5cc12b1ede80e295d8c248caee Mon Sep 17 00:00:00 2001
From: Giles Bathgate <giles.bathgate@blueprism.com>
Date: Sun, 25 Aug 2024 18:58:55 +0100
Subject: [PATCH 2/3] Move the delete to the end of the function

---
 .../CGAL/Convex_decomposition_3/External_structure_builder.h    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/External_structure_builder.h b/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/External_structure_builder.h
index 7bbf805248b5..f43609baafdb 100644
--- a/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/External_structure_builder.h
+++ b/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/External_structure_builder.h
@@ -81,10 +81,10 @@ class External_structure_builder : public Modifier_base<typename Nef_::SNC_and_P
     SNC_point_locator* old_pl = pl;
     pl = pl->clone();
     sncpl.pl = pl;
-    delete old_pl;
     SNC_external_structure C(*sncp,pl);
     C.clear_external_structure();
     C.build_external_structure();
+    delete old_pl;
   }
 };
 

From cf30f4dfab94a732c93f1cff3a5a9d5584343132 Mon Sep 17 00:00:00 2001
From: Giles Bathgate <giles.bathgate@blueprism.com>
Date: Mon, 26 Aug 2024 09:29:21 +0100
Subject: [PATCH 3/3] Remove unused hashmap

---
 .../CGAL/Convex_decomposition_3/External_structure_builder.h    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/External_structure_builder.h b/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/External_structure_builder.h
index f43609baafdb..c6ecee86c0b6 100644
--- a/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/External_structure_builder.h
+++ b/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/External_structure_builder.h
@@ -76,8 +76,6 @@ class External_structure_builder : public Modifier_base<typename Nef_::SNC_and_P
 
     SNC_structure* sncp(sncpl.sncp);
     SNC_point_locator* pl(sncpl.pl);
-
-    Unique_hash_map<SHalfedge_handle, SFace_handle> sedge2sface;
     SNC_point_locator* old_pl = pl;
     pl = pl->clone();
     sncpl.pl = pl;