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

no need to workaround boost 1.54 anymore 

because CGAL now requires boost 1.66 or higher
This commit is contained in:
Jane Tournois 2023-10-10 19:32:59 +02:00
parent 3c8e205372
commit 6e6598cd5e
5 changed files with 4 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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,

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