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

boost::is_integral -> std::is_integral

This commit is contained in:
Sébastien Loriot 2023-04-23 21:15:38 +02:00
parent 390cccf63b
commit 6fd9476cd7
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Io_image_plugin.cpp
View File

@ -855,18 +855,18 @@ private:
template<typename T>
void switchReaderConverter(std::pair<T, T> minmax)
{
switchReaderConverter(minmax, typename boost::is_integral<T>::type());
switchReaderConverter(minmax, typename std::is_integral<T>::type());
}
template<typename T>
void switchReaderConverter(std::pair<T, T> minmax, boost::true_type)
void switchReaderConverter(std::pair<T, T> minmax, std::true_type)
{
// IntConverter
IntConverter x = { minmax }; pxr_.setIC(x);
}
template<typename T>
void switchReaderConverter(std::pair<T, T> minmax, boost::false_type)
void switchReaderConverter(std::pair<T, T> minmax, std::false_type)
{
// IntConverter
DoubleConverter x = { minmax }; pxr_.setFC(x);

4
STL_Extension/include/CGAL/transforming_iterator.h
View File

@ -12,9 +12,7 @@
#ifndef CGAL_TRANSFORMING_ITERATOR_H
#define CGAL_TRANSFORMING_ITERATOR_H
#include <boost/iterator/iterator_adaptor.hpp>
#include <boost/type_traits/is_empty.hpp>
#include <boost/type_traits/is_reference.hpp>
#include <boost/type_traits/is_integral.hpp>
#include <boost/mpl/if.hpp>
#include <boost/mpl/or.hpp>
#include <CGAL/Default.h>
@ -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_reference<Iter_ref>,
boost::is_integral<Iter_ref> >,
std::is_integral<Iter_ref> >,
reference_, value_type>::type reference;
public: