From 6e6598cd5ed219652efa70dc5e31a0120c5e47ed Mon Sep 17 00:00:00 2001 From: Jane Tournois Date: Tue, 10 Oct 2023 19:32:59 +0200 Subject: [PATCH 1/3] no need to workaround boost 1.54 anymore because CGAL now requires boost 1.66 or higher --- .../boost/graph/dijkstra_shortest_paths.h | 30 ------------------- .../Envelope_divide_and_conquer_3.h | 2 +- .../include/CGAL/mst_orient_normals.h | 6 +--- .../CGAL/Variational_shape_approximation.h | 2 +- .../orbifold_shortest_path.h | 2 +- 5 files changed, 4 insertions(+), 38 deletions(-) delete mode 100644 BGL/include/CGAL/boost/graph/dijkstra_shortest_paths.h diff --git a/BGL/include/CGAL/boost/graph/dijkstra_shortest_paths.h b/BGL/include/CGAL/boost/graph/dijkstra_shortest_paths.h deleted file mode 100644 index a8563023229..00000000000 --- a/BGL/include/CGAL/boost/graph/dijkstra_shortest_paths.h +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright (c) 2014 GeometryFactory (France). All rights reserved. -// -// This file is part of CGAL (www.cgal.org) -// -// $URL$ -// $Id$ -// SPDX-License-Identifier: LGPL-3.0-or-later OR LicenseRef-Commercial -// -// -// Author(s) : Sebastien Loriot - - -#ifndef CGAL_BOOST_GRAPH_DIJKSTRA_SHORTEST_PATHS_H -#define CGAL_BOOST_GRAPH_DIJKSTRA_SHORTEST_PATHS_H - -// This will push/pop a VC++ warning -#include - -#if defined(BOOST_MSVC) -# pragma warning(push) -# pragma warning(disable:4172) // Address warning inside boost named parameters -#endif - -#include - -#if defined(BOOST_MSVC) -# pragma warning(pop) -#endif - -#endif // CGAL_BOOST_GRAPH_DIJKSTRA_SHORTEST_PATHS_H diff --git a/Envelope_3/include/CGAL/Envelope_3/Envelope_divide_and_conquer_3.h b/Envelope_3/include/CGAL/Envelope_3/Envelope_divide_and_conquer_3.h index 35b172c6233..dd0b25438da 100644 --- a/Envelope_3/include/CGAL/Envelope_3/Envelope_divide_and_conquer_3.h +++ b/Envelope_3/include/CGAL/Envelope_3/Envelope_divide_and_conquer_3.h @@ -38,7 +38,7 @@ #ifdef CGAL_ENVELOPE_USE_BFS_FACE_ORDER #include #include -#include +#include #endif // this base divide & conquer algorithm splits the input into 2 groups, diff --git a/Point_set_processing_3/include/CGAL/mst_orient_normals.h b/Point_set_processing_3/include/CGAL/mst_orient_normals.h index bc67439f053..aae5a4eeed7 100644 --- a/Point_set_processing_3/include/CGAL/mst_orient_normals.h +++ b/Point_set_processing_3/include/CGAL/mst_orient_normals.h @@ -39,11 +39,7 @@ #include #include -#include // work around a - // bug in boost - // 1.54 - - +#include #include #if defined(BOOST_MSVC) diff --git a/Surface_mesh_approximation/include/CGAL/Variational_shape_approximation.h b/Surface_mesh_approximation/include/CGAL/Variational_shape_approximation.h index 566aec602d7..71bca5a67b8 100644 --- a/Surface_mesh_approximation/include/CGAL/Variational_shape_approximation.h +++ b/Surface_mesh_approximation/include/CGAL/Variational_shape_approximation.h @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include diff --git a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/orbifold_shortest_path.h b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/orbifold_shortest_path.h index a839ff3d8ce..3f8cdb0b93a 100644 --- a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/orbifold_shortest_path.h +++ b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/orbifold_shortest_path.h @@ -18,7 +18,7 @@ #include -#include +#include #include #include From 6b8eaa4e5c22003ab5160b4ab9bf45c2363820c5 Mon Sep 17 00:00:00 2001 From: Jane Tournois Date: Thu, 12 Oct 2023 10:12:09 +0200 Subject: [PATCH 2/3] remove CGAL workaround from cpp files --- .../examples/Arrangement_on_surface_2/bgl_primal_adapter.cpp | 2 +- .../test/Arrangement_on_surface_2/test_dual.cpp | 2 +- BGL/examples/BGL_arrangement_2/primal.cpp | 2 +- BGL/examples/BGL_triangulation_2/dijkstra.cpp | 2 +- .../BGL_triangulation_2/dijkstra_with_internal_properties.cpp | 2 +- .../demo/Polyhedron/Scene_polyhedron_selection_item.cpp | 2 +- Surface_mesh/examples/Surface_mesh/sm_bgl.cpp | 4 +--- 7 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Arrangement_on_surface_2/examples/Arrangement_on_surface_2/bgl_primal_adapter.cpp b/Arrangement_on_surface_2/examples/Arrangement_on_surface_2/bgl_primal_adapter.cpp index 163125c0e3d..c232a671542 100644 --- a/Arrangement_on_surface_2/examples/Arrangement_on_surface_2/bgl_primal_adapter.cpp +++ b/Arrangement_on_surface_2/examples/Arrangement_on_surface_2/bgl_primal_adapter.cpp @@ -5,7 +5,7 @@ #include -#include +#include #include #include diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_dual.cpp b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_dual.cpp index 1915f8a1a23..98c2c4b1526 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_dual.cpp +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_dual.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include #include diff --git a/BGL/examples/BGL_arrangement_2/primal.cpp b/BGL/examples/BGL_arrangement_2/primal.cpp index 62d684e0c42..e5f954dfdad 100644 --- a/BGL/examples/BGL_arrangement_2/primal.cpp +++ b/BGL/examples/BGL_arrangement_2/primal.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include diff --git a/BGL/examples/BGL_triangulation_2/dijkstra.cpp b/BGL/examples/BGL_triangulation_2/dijkstra.cpp index 3a1b061eb9e..7915bdb12b5 100644 --- a/BGL/examples/BGL_triangulation_2/dijkstra.cpp +++ b/BGL/examples/BGL_triangulation_2/dijkstra.cpp @@ -1,7 +1,7 @@ #include #include -#include +#include #include diff --git a/BGL/examples/BGL_triangulation_2/dijkstra_with_internal_properties.cpp b/BGL/examples/BGL_triangulation_2/dijkstra_with_internal_properties.cpp index b1bc089d216..bcd9548338f 100644 --- a/BGL/examples/BGL_triangulation_2/dijkstra_with_internal_properties.cpp +++ b/BGL/examples/BGL_triangulation_2/dijkstra_with_internal_properties.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include diff --git a/Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.cpp b/Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.cpp index 561f3f7c8fb..737cf1f23c8 100644 --- a/Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.cpp +++ b/Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.cpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Surface_mesh/examples/Surface_mesh/sm_bgl.cpp b/Surface_mesh/examples/Surface_mesh/sm_bgl.cpp index 93c9655eb47..5269caf38e3 100644 --- a/Surface_mesh/examples/Surface_mesh/sm_bgl.cpp +++ b/Surface_mesh/examples/Surface_mesh/sm_bgl.cpp @@ -4,9 +4,7 @@ #include #include -// workaround a bug in Boost-1.54 -#include - +#include #include typedef CGAL::Simple_cartesian Kernel; From 7435d07d262b12cd75f0ffe050665386b0574670 Mon Sep 17 00:00:00 2001 From: Jane Tournois Date: Thu, 12 Oct 2023 11:30:42 +0200 Subject: [PATCH 3/3] fix dependencies --- Envelope_3/package_info/Envelope_3/dependencies | 1 - 1 file changed, 1 deletion(-) diff --git a/Envelope_3/package_info/Envelope_3/dependencies b/Envelope_3/package_info/Envelope_3/dependencies index 059d79cfb7d..5abc02d0186 100644 --- a/Envelope_3/package_info/Envelope_3/dependencies +++ b/Envelope_3/package_info/Envelope_3/dependencies @@ -2,7 +2,6 @@ Algebraic_foundations Apollonius_graph_2 Arithmetic_kernel Arrangement_on_surface_2 -BGL Cartesian_kernel Circulator Distance_2