From 6fd9476cd79c85a322fe1ef8153ccd7d0d9864bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Sun, 23 Apr 2023 21:15:38 +0200 Subject: [PATCH] boost::is_integral -> std::is_integral --- .../demo/Polyhedron/Plugins/Mesh_3/Io_image_plugin.cpp | 6 +++--- STL_Extension/include/CGAL/transforming_iterator.h | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Io_image_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Io_image_plugin.cpp index 68c3053d876..67da801ae91 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Io_image_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Io_image_plugin.cpp @@ -855,18 +855,18 @@ private: template void switchReaderConverter(std::pair minmax) { - switchReaderConverter(minmax, typename boost::is_integral::type()); + switchReaderConverter(minmax, typename std::is_integral::type()); } template - void switchReaderConverter(std::pair minmax, boost::true_type) + void switchReaderConverter(std::pair minmax, std::true_type) { // IntConverter IntConverter x = { minmax }; pxr_.setIC(x); } template - void switchReaderConverter(std::pair minmax, boost::false_type) + void switchReaderConverter(std::pair minmax, std::false_type) { // IntConverter DoubleConverter x = { minmax }; pxr_.setFC(x); diff --git a/STL_Extension/include/CGAL/transforming_iterator.h b/STL_Extension/include/CGAL/transforming_iterator.h index 97287711aec..fe61368ddfb 100644 --- a/STL_Extension/include/CGAL/transforming_iterator.h +++ b/STL_Extension/include/CGAL/transforming_iterator.h @@ -12,9 +12,7 @@ #ifndef CGAL_TRANSFORMING_ITERATOR_H #define CGAL_TRANSFORMING_ITERATOR_H #include -#include #include -#include #include #include #include @@ -60,7 +58,7 @@ class transforming_iterator_helper // Crappy heuristic. If we have *it that returns a Weighted_point and F that returns a reference to the Point contained in the Weighted_point it takes as argument, we do NOT want the transformed iterator to return a reference to the temporary *it. On the other hand, if *it returns an int n, and F returns a reference to array[n] it is not so good to lose the reference. This probably should be done elsewhere and should at least be made optional... typedef typename boost::mpl::if_< boost::mpl::or_, - boost::is_integral >, + std::is_integral >, reference_, value_type>::type reference; public: