Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BGL - no need to workaround boost 1.54 anymore #7784

Merged
merged 3 commits into from
Nov 6, 2023
Merged

BGL - no need to workaround boost 1.54 anymore #7784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6e6598c
no need to workaround boost 1.54 anymore
janetournois Oct 10, 2023
6b8eaa4
remove CGAL workaround from cpp files
janetournois Oct 12, 2023
7435d07
fix dependencies
janetournois Oct 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Arrangement_on_surface_2/examples/Arrangement_on_surface_2/bgl_primal_adapter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#include <CGAL/config.h>

#include <CGAL/boost/graph/dijkstra_shortest_paths.h>
#include <boost/graph/dijkstra_shortest_paths.hpp>
#include <boost/property_map/vector_property_map.hpp>

#include <CGAL/graph_traits_Arrangement_2.h>
Expand Down
2 changes: 1 addition & 1 deletion Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_dual.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <CGAL/Arr_extended_dcel.h>
#include <CGAL/Arrangement_2.h>

#include <CGAL/boost/graph/dijkstra_shortest_paths.h>
#include <boost/graph/dijkstra_shortest_paths.hpp>

#include <CGAL/graph_traits_dual_arrangement_2.h>

Expand Down
2 changes: 1 addition & 1 deletion BGL/examples/BGL_arrangement_2/primal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <CGAL/graph_traits_Arrangement_2.h>
#include <CGAL/Arr_vertex_index_map.h>

#include <CGAL/boost/graph/dijkstra_shortest_paths.h>
#include <boost/graph/dijkstra_shortest_paths.hpp>

#include <CGAL/property_map.h>

Expand Down
2 changes: 1 addition & 1 deletion BGL/examples/BGL_triangulation_2/dijkstra.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>

#include <CGAL/boost/graph/graph_traits_Triangulation_2.h>
#include <CGAL/boost/graph/dijkstra_shortest_paths.h>
#include <boost/graph/dijkstra_shortest_paths.hpp>

#include <fstream>

Expand Down
2 changes: 1 addition & 1 deletion BGL/examples/BGL_triangulation_2/dijkstra_with_internal_properties.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <CGAL/Triangulation_vertex_base_with_id_2.h>

#include <CGAL/boost/graph/graph_traits_Delaunay_triangulation_2.h>
#include <CGAL/boost/graph/dijkstra_shortest_paths.h>
#include <boost/graph/dijkstra_shortest_paths.hpp>

#include <fstream>

Expand Down
30 changes: 0 additions & 30 deletions BGL/include/CGAL/boost/graph/dijkstra_shortest_paths.h
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion Envelope_3/include/CGAL/Envelope_3/Envelope_divide_and_conquer_3.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
#ifdef CGAL_ENVELOPE_USE_BFS_FACE_ORDER
#include <CGAL/Arr_face_index_map.h>
#include <CGAL/graph_traits_dual_arrangement_on_surface_2.h>
#include <CGAL/boost/graph/dijkstra_shortest_paths.h>
#include <boost/graph/dijkstra_shortest_paths.hpp>
#endif

// this base divide & conquer algorithm splits the input into 2 groups,
Expand Down
1 change: 0 additions & 1 deletion Envelope_3/package_info/Envelope_3/dependencies
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ Algebraic_foundations
Apollonius_graph_2
Arithmetic_kernel
Arrangement_on_surface_2
BGL
Cartesian_kernel
Circulator
Distance_2
Expand Down
6 changes: 1 addition & 5 deletions Point_set_processing_3/include/CGAL/mst_orient_normals.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,7 @@

#include <CGAL/property_map.h>
#include <boost/graph/adjacency_list.hpp>
#include <CGAL/boost/graph/dijkstra_shortest_paths.h> // work around a
// bug in boost
// 1.54


#include <boost/graph/dijkstra_shortest_paths.hpp>
#include <boost/graph/prim_minimum_spanning_tree.hpp>

#if defined(BOOST_MSVC)
Expand Down
2 changes: 1 addition & 1 deletion Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <CGAL/Polygon_mesh_processing/compute_normal.h>
#include <CGAL/Polygon_mesh_processing/repair.h>
#include <CGAL/Polygon_mesh_processing/shape_predicates.h>
#include <CGAL/boost/graph/dijkstra_shortest_paths.h>
#include <boost/graph/dijkstra_shortest_paths.hpp>
#include <CGAL/boost/graph/helpers.h>
#include <CGAL/property_map.h>
#include <CGAL/Handle_hash_function.h>
Expand Down
4 changes: 1 addition & 3 deletions Surface_mesh/examples/Surface_mesh/sm_bgl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
#include <iostream>
#include <fstream>

// workaround a bug in Boost-1.54
#include <CGAL/boost/graph/dijkstra_shortest_paths.h>

#include <boost/graph/dijkstra_shortest_paths.hpp>
#include <boost/graph/prim_minimum_spanning_tree.hpp>

typedef CGAL::Simple_cartesian<double> Kernel;
Expand Down
2 changes: 1 addition & 1 deletion Surface_mesh_approximation/include/CGAL/Variational_shape_approximation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

#include <boost/graph/graph_traits.hpp>
#include <boost/graph/adjacency_list.hpp>
#include <CGAL/boost/graph/dijkstra_shortest_paths.h>
#include <boost/graph/dijkstra_shortest_paths.hpp>
#include <boost/graph/subgraph.hpp>
#include <boost/optional.hpp>

Expand Down
2 changes: 1 addition & 1 deletion ...mesh_parameterization/include/CGAL/Surface_mesh_parameterization/orbifold_shortest_path.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#include <CGAL/assertions.h>

#include <CGAL/boost/graph/dijkstra_shortest_paths.h>
#include <boost/graph/dijkstra_shortest_paths.hpp>
#include <boost/graph/graph_traits.hpp>

#include <unordered_map>
Expand Down