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

Jump to bottom

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

merged 3 commits into from
Nov 6, 2023

Conversation

janetournois
Copy link
Member

Summary of Changes

CGAL requires boost 1.66 or higher since CGAL-5.6.

The workaround about dijkstra_shortest_paths.hpp can be removed.

Release Management

  • Affected package(s): BGL, Envelope_3, Point_set_processing_3, Surface_mesh_parameterization, Surface_mesh_approximation
  • License and copyright ownership: unchanged

Thank you @albert-github for the report in #7765

@janetournois
no need to workaround boost 1.54 anymore
6e6598c 
because CGAL now requires boost 1.66 or higher
@janetournois janetournois added this to the 5.6.1 milestone Oct 10, 2023
@albert-github
Copy link
Contributor

How about in Surface_mesh/examples/Surface_mesh/sm_bgl.cpp

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

Actually there are some more places where dijkstra_shortest_paths.h is used and not been mentioned in the PR or just above:

Arrangement_on_surface_2/examples/Arrangement_on_surface_2/bgl_primal_adapter.cpp
Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_dual.cpp
BGL/examples/BGL_arrangement_2/primal.cpp
BGL/examples/BGL_triangulation_2/dijkstra.cpp
BGL/examples/BGL_triangulation_2/dijkstra_with_internal_properties.cpp
Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.cpp

@sloriot sloriot added the Batch_2 Second Batch of PRs under testing label Oct 16, 2023
@sloriot sloriot added Batch_1 First Batch of PRs under testing Under Testing and removed Batch_2 Second Batch of PRs under testing Batch_1 First Batch of PRs under testing labels Oct 24, 2023
@sloriot
Copy link
Member

sloriot commented Nov 2, 2023

Successfully tested in CGAL-6.0-Ic-96

@lrineau lrineau self-assigned this Nov 2, 2023
@lrineau lrineau added the rm only: ready for master For the release team only: that indicates that a PR is about to be merged in 'master' label Nov 2, 2023
@lrineau lrineau merged commit 08b5c90 into CGAL:5.6.x-branch Nov 6, 2023
8 checks passed
lrineau added a commit that referenced this pull request Nov 6, 2023
@lrineau
Merge pull request #7784 from janetournois/BGL-warning_fixed-jtournois
bdfe153 
BGL - no need to workaround boost 1.54 anymore
@lrineau lrineau removed the rm only: ready for master For the release team only: that indicates that a PR is about to be merged in 'master' label Nov 6, 2023
@lrineau lrineau deleted the BGL-warning_fixed-jtournois branch November 6, 2023 11:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@lrineau lrineau

Labels
Cleaning Merged_in_5.6.1 Merged_in_5.6.2 Merged_in_6.0 Pkg::BGL Tested
Projects
None yet
Milestone
5.6.1
Development

Successfully merging this pull request may close these issues.
4 participants
@janetournois @albert-github @sloriot @lrineau