From eb1c10516a7ffcc1c647a740623436b6777c34ba Mon Sep 17 00:00:00 2001
From: Laurent Rineau <laurent.rineau@cgal.org>
Date: Thu, 6 Jun 2024 12:27:34 +0200
Subject: [PATCH] rename/move internal headers

---
 .../internal}/Poisson_mesh_traits_generator_3.h    | 14 +++++++++-----
 .../internal}/Poisson_sphere_oracle_3.h            |  6 +++++-
 .../Poisson_implicit_surface_oracle_3.h            |  2 +-
 .../include/CGAL/poisson_refine_triangulation.h    |  2 +-
 4 files changed, 16 insertions(+), 8 deletions(-)
 rename Poisson_surface_reconstruction_3/include/CGAL/{Mesh_3 => Poisson_surface_reconstruction_3/internal}/Poisson_mesh_traits_generator_3.h (63%)
 rename Poisson_surface_reconstruction_3/include/CGAL/{Surface_mesher => Poisson_surface_reconstruction_3/internal}/Poisson_sphere_oracle_3.h (97%)

diff --git a/Poisson_surface_reconstruction_3/include/CGAL/Mesh_3/Poisson_mesh_traits_generator_3.h b/Poisson_surface_reconstruction_3/include/CGAL/Poisson_surface_reconstruction_3/internal/Poisson_mesh_traits_generator_3.h
similarity index 63%
rename from Poisson_surface_reconstruction_3/include/CGAL/Mesh_3/Poisson_mesh_traits_generator_3.h
rename to Poisson_surface_reconstruction_3/include/CGAL/Poisson_surface_reconstruction_3/internal/Poisson_mesh_traits_generator_3.h
index b92b6488db8..c9330fa5704 100644
--- a/Poisson_surface_reconstruction_3/include/CGAL/Mesh_3/Poisson_mesh_traits_generator_3.h
+++ b/Poisson_surface_reconstruction_3/include/CGAL/Poisson_surface_reconstruction_3/internal/Poisson_mesh_traits_generator_3.h
@@ -1,4 +1,5 @@
-// Copyright (c) 2006-2007, 2024  INRIA Sophia-Antipolis (France).
+// Copyright (c) 2006-2007  INRIA Sophia-Antipolis (France).
+// Copyright (c) 2024       GeometryFactory Sarl (France)
 // All rights reserved.
 //
 // This file is part of CGAL (www.cgal.org).
@@ -9,13 +10,16 @@
 //
 // Author(s)     : Laurent Rineau, Jane Tournois
 
-#ifndef CGAL_MESH_3_POISSON_MESH_TRAITS_GENERATOR_3_H
-#define CGAL_MESH_3_POISSON_MESH_TRAITS_GENERATOR_3_H
+// This file is a copy-paste-adaptation of Surface_mesher/include/CGAL/Surface_mesh_traits_generator_3.h
+// Surface_mesher that has been deprecated and will be removed in the future.
+
+#ifndef CGAL_POISSON_MESH_TRAITS_GENERATOR_3_H
+#define CGAL_POISSON_MESH_TRAITS_GENERATOR_3_H
 
 #include <CGAL/license/Poisson_surface_reconstruction_3.h>
 
 
-#include <CGAL/Surface_mesher/Poisson_sphere_oracle_3.h>
+#include <CGAL/Poisson_surface_reconstruction_3/internal/Poisson_sphere_oracle_3.h>
 
 namespace CGAL {
 
@@ -42,4 +46,4 @@ struct Poisson_mesh_traits_generator_3<CGAL::Sphere_3<Kernel> >
 
 } // end namespace CGAL
 
-#endif // CGAL_MESH_3_POISSON_MESH_TRAITS_GENERATOR_3_H
+#endif // CGAL_POISSON_MESH_TRAITS_GENERATOR_3_H
diff --git a/Poisson_surface_reconstruction_3/include/CGAL/Surface_mesher/Poisson_sphere_oracle_3.h b/Poisson_surface_reconstruction_3/include/CGAL/Poisson_surface_reconstruction_3/internal/Poisson_sphere_oracle_3.h
similarity index 97%
rename from Poisson_surface_reconstruction_3/include/CGAL/Surface_mesher/Poisson_sphere_oracle_3.h
rename to Poisson_surface_reconstruction_3/include/CGAL/Poisson_surface_reconstruction_3/internal/Poisson_sphere_oracle_3.h
index 8ff4e4ea72e..b448d18440d 100644
--- a/Poisson_surface_reconstruction_3/include/CGAL/Surface_mesher/Poisson_sphere_oracle_3.h
+++ b/Poisson_surface_reconstruction_3/include/CGAL/Poisson_surface_reconstruction_3/internal/Poisson_sphere_oracle_3.h
@@ -1,4 +1,5 @@
 // Copyright (c) 2006-2007  INRIA Sophia-Antipolis (France).
+// Copyright (c) 2024       GeometryFactory Sarl (France)
 // All rights reserved.
 //
 // This file is part of CGAL (www.cgal.org).
@@ -10,10 +11,13 @@
 //
 // Author(s)     : Laurent RINEAU
 
+// This file is a copy-paste-adaptation of Surface_mesher/include/CGAL/Poisson_implicit_surface_oracle_3.h
+// Surface_mesher that has been deprecated and will be removed in the future.
+
 #ifndef CGAL_POISSON_SURFACE_MESHER_POISSON_SPHERE_ORACLE_3_H
 #define CGAL_POISSON_SURFACE_MESHER_POISSON_SPHERE_ORACLE_3_H
 
-#include <CGAL/license/Surface_mesher.h>
+#include <CGAL/license/Poisson_surface_reconstruction_3.h>
 
 #include <CGAL/disable_warnings.h>
 #include <CGAL/point_generators_3.h>
diff --git a/Poisson_surface_reconstruction_3/include/CGAL/Surface_mesher/Poisson_implicit_surface_oracle_3.h b/Poisson_surface_reconstruction_3/include/CGAL/Surface_mesher/Poisson_implicit_surface_oracle_3.h
index 1e282df8c0b..e01380b19f4 100644
--- a/Poisson_surface_reconstruction_3/include/CGAL/Surface_mesher/Poisson_implicit_surface_oracle_3.h
+++ b/Poisson_surface_reconstruction_3/include/CGAL/Surface_mesher/Poisson_implicit_surface_oracle_3.h
@@ -18,7 +18,7 @@
 
 
 #include <CGAL/point_generators_3.h>
-#include <CGAL/Surface_mesher/Poisson_sphere_oracle_3.h>
+#include <CGAL/Poisson_surface_reconstruction_3/internal/Poisson_sphere_oracle_3.h>
 #include <CGAL/Surface_mesher/Implicit_surface_oracle_3.h>
 #include <CGAL/Real_embeddable_traits.h>
 #include <CGAL/squared_distance_3.h>
diff --git a/Poisson_surface_reconstruction_3/include/CGAL/poisson_refine_triangulation.h b/Poisson_surface_reconstruction_3/include/CGAL/poisson_refine_triangulation.h
index 13f08e45727..75a2f3fe062 100644
--- a/Poisson_surface_reconstruction_3/include/CGAL/poisson_refine_triangulation.h
+++ b/Poisson_surface_reconstruction_3/include/CGAL/poisson_refine_triangulation.h
@@ -21,7 +21,7 @@
 #include <CGAL/Mesh_3/Poisson_refine_cells_3.h>
 #include <CGAL/Poisson_mesh_cell_criteria_3.h>
 #include <CGAL/assertions.h>
-#include <CGAL/Mesh_3/Poisson_mesh_traits_generator_3.h>
+#include <CGAL/Poisson_surface_reconstruction_3/internal/Poisson_mesh_traits_generator_3.h>
 
 namespace CGAL {