songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7784 from janetournois/BGL-warning_fixed-jtournois 

BGL - no need to workaround boost 1.54 anymore
This commit is contained in:
Laurent Rineau 2023-11-06 12:37:47 +01:00
parent 07d93e2b45 7435d07d26
commit 08b5c90955
13 changed files with 11 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Arrangement_on_surface_2/examples/Arrangement_on_surface_2/bgl_primal_adapter.cpp
View File

@ -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>

2
Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_dual.cpp
View File

@ -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>

2
BGL/examples/BGL_arrangement_2/primal.cpp
View File

@ -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>

2
BGL/examples/BGL_triangulation_2/dijkstra.cpp
View File

@ -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>

2
BGL/examples/BGL_triangulation_2/dijkstra_with_internal_properties.cpp
View File

@ -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>

30
BGL/include/CGAL/boost/graph/dijkstra_shortest_paths.h
View File

@ -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 <CGAL/Named_function_parameters.h>
#if defined(BOOST_MSVC)
# pragma warning(push)
# pragma warning(disable:4172) // Address warning inside boost named parameters
#endif
#include <boost/graph/dijkstra_shortest_paths.hpp>
#if defined(BOOST_MSVC)
# pragma warning(pop)
#endif
#endif // CGAL_BOOST_GRAPH_DIJKSTRA_SHORTEST_PATHS_H

2
Envelope_3/include/CGAL/Envelope_3/Envelope_divide_and_conquer_3.h
View File

@ -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,

1
Envelope_3/package_info/Envelope_3/dependencies
View File

@ -2,7 +2,6 @@ Algebraic_foundations
Apollonius_graph_2
Arithmetic_kernel
Arrangement_on_surface_2
BGL
Cartesian_kernel
Circulator
Distance_2

6
Point_set_processing_3/include/CGAL/mst_orient_normals.h
View File

@ -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)

2
Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.cpp
View File

@ -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>

4
Surface_mesh/examples/Surface_mesh/sm_bgl.cpp
View File

@ -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;

2
Surface_mesh_approximation/include/CGAL/Variational_shape_approximation.h
View File

@ -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>

2
Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/orbifold_shortest_path.h
View File

@ -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>