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

Merge remote-tracking branch 'cgal/5.6.x-branch' into 6.0.x-branch

This commit is contained in:
Sébastien Loriot 2025-04-03 16:09:15 +02:00
parent b45c29edd4 913c8bf40f
commit f516c12c5b
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Convex_hull_3/include/CGAL/convex_hull_3.h
View File

@ -45,6 +45,7 @@
#include <boost/mpl/has_xxx.hpp> #include <boost/mpl/has_xxx.hpp>
#include <boost/graph/graph_traits.hpp> #include <boost/graph/graph_traits.hpp>
#include <boost/range/has_range_iterator.hpp>
#include <type_traits> #include <type_traits>
@ -69,6 +70,8 @@ template<class VertexPointMap,class Base_traits> class Extreme_points_traits_ada
namespace Convex_hull_3 { namespace Convex_hull_3 {
namespace internal { namespace internal {
BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF(Has_nested_type_Collinear_3, Collinear_3, false)
// wrapper used as a MutableFaceGraph to extract extreme points // wrapper used as a MutableFaceGraph to extract extreme points
template <class OutputIterator> template <class OutputIterator>
struct Output_iterator_wrapper struct Output_iterator_wrapper
@ -993,7 +996,8 @@ void convex_hull_3(InputIterator first, InputIterator beyond,
template <class InputIterator, class PolygonMesh, class Traits> template <class InputIterator, class PolygonMesh, class Traits>
void convex_hull_3(InputIterator first, InputIterator beyond, void convex_hull_3(InputIterator first, InputIterator beyond,
PolygonMesh& polyhedron, PolygonMesh& polyhedron,
const Traits& traits) const Traits& traits,
std::enable_if_t<Convex_hull_3::internal::Has_nested_type_Collinear_3<Traits>::value>* = 0)
{ {
typedef typename Traits::Point_3 Point_3; typedef typename Traits::Point_3 Point_3;
typedef std::list<Point_3> Point_3_list; typedef std::list<Point_3> Point_3_list;

1
Optimal_bounding_box/include/CGAL/Optimal_bounding_box/oriented_bounding_box.h
View File

@ -36,6 +36,7 @@
#include <CGAL/Real_timer.h> #include <CGAL/Real_timer.h>
#endif #endif
#include <boost/range/has_range_iterator.hpp>
#include <boost/iterator/transform_iterator.hpp> #include <boost/iterator/transform_iterator.hpp>
#include <boost/range/value_type.hpp> #include <boost/range/value_type.hpp>

1
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/intersection.h
View File

@ -28,6 +28,7 @@
#include <CGAL/Polygon_mesh_processing/connected_components.h> #include <CGAL/Polygon_mesh_processing/connected_components.h>
#include <CGAL/Side_of_triangle_mesh.h> #include <CGAL/Side_of_triangle_mesh.h>
#include <boost/range/has_range_iterator.hpp>
#include <boost/iterator/function_output_iterator.hpp> #include <boost/iterator/function_output_iterator.hpp>
#include <exception> #include <exception>