mirror of https://github.com/CGAL/cgal
boost::is_base_of -> std::is_base_of
This commit is contained in:
parent
b039040f73
commit
cf45dd3d5b
|
|
@ -23,7 +23,6 @@
|
|||
#include <type_traits>
|
||||
|
||||
#include <boost/mpl/has_xxx.hpp>
|
||||
#include <boost/type_traits/is_base_of.hpp>
|
||||
#include <boost/mpl/and.hpp>
|
||||
#include <boost/mpl/logical.hpp>
|
||||
|
||||
|
|
@ -73,7 +72,7 @@ template<typename Comparable>
|
|||
struct Is_derived_from_Handle_with_policy<Comparable,true> {
|
||||
|
||||
typedef typename
|
||||
boost::is_base_of< CGAL::Handle_with_policy
|
||||
std::is_base_of< CGAL::Handle_with_policy
|
||||
< typename Comparable::T,
|
||||
typename Comparable::Handle_policy,
|
||||
typename Comparable::Allocator >,
|
||||
|
|
|
|||
|
|
@ -431,7 +431,7 @@ public:
|
|||
template < class InputIterator >
|
||||
std::ptrdiff_t insert(InputIterator first, InputIterator last,
|
||||
std::enable_if_t<
|
||||
boost::is_base_of<Point, typename std::iterator_traits<InputIterator>::value_type>::value
|
||||
std::is_base_of<Point, typename std::iterator_traits<InputIterator>::value_type>::value
|
||||
>* = nullptr)
|
||||
#else
|
||||
template < class InputIterator >
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
#include <CGAL/Mesh_facet_criteria_3.h>
|
||||
#include <CGAL/Mesh_cell_criteria_3.h>
|
||||
#include <cfloat> // for the macro DBL_MAX
|
||||
#include <boost/type_traits/is_base_of.hpp>
|
||||
|
||||
namespace CGAL {
|
||||
|
||||
|
||||
|
|
@ -98,7 +98,7 @@ public:
|
|||
|
||||
template <typename Facet_criterion>
|
||||
void add_facet_criterion(Facet_criterion* criterion) {
|
||||
CGAL_static_assertion((boost::is_base_of<
|
||||
CGAL_static_assertion((std::is_base_of<
|
||||
typename Facet_criteria::Abstract_criterion,
|
||||
Facet_criterion
|
||||
>::value));
|
||||
|
|
@ -107,7 +107,7 @@ public:
|
|||
|
||||
template <typename Cell_criterion>
|
||||
void add_cell_criterion(Cell_criterion* criterion) {
|
||||
CGAL_static_assertion((boost::is_base_of<
|
||||
CGAL_static_assertion((std::is_base_of<
|
||||
typename Cell_criteria::Abstract_criterion,
|
||||
Cell_criterion
|
||||
>::value));
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ struct is_iterator_type_
|
|||
|
||||
template <class T,class U>
|
||||
struct is_iterator_type_<T, U, true>
|
||||
: public //boost::is_base_of<U,typename std::iterator_traits<T>::iterator_category>
|
||||
: public //std::is_base_of<U,typename std::iterator_traits<T>::iterator_category>
|
||||
std::is_convertible<typename std::iterator_traits<T>::iterator_category, U>
|
||||
{ };
|
||||
|
||||
|
|
|
|||
|
|
@ -12,8 +12,6 @@
|
|||
#include <CGAL/use.h>
|
||||
#include <CGAL/assertions.h>
|
||||
|
||||
#include <boost/type_traits/is_base_of.hpp>
|
||||
|
||||
#include <CGAL/disable_warnings.h>
|
||||
|
||||
template <typename Has_timestamp_ = CGAL::Tag_true>
|
||||
|
|
@ -324,22 +322,22 @@ int main()
|
|||
test_time_stamps<C4>();
|
||||
|
||||
// Check the time stamper policies
|
||||
if(! boost::is_base_of<CGAL::Time_stamper<T1>,
|
||||
if(! std::is_base_of<CGAL::Time_stamper<T1>,
|
||||
C1::Time_stamper>::value)
|
||||
{
|
||||
std::cerr << "Error timestamper of C1\n"; return 1;
|
||||
}
|
||||
if(! boost::is_base_of<CGAL::No_time_stamp<T2>,
|
||||
if(! std::is_base_of<CGAL::No_time_stamp<T2>,
|
||||
C2::Time_stamper>::value)
|
||||
{
|
||||
std::cerr << "Error timestamper of C2\n"; return 1;
|
||||
}
|
||||
if(! boost::is_base_of<CGAL::No_time_stamp<T3>,
|
||||
if(! std::is_base_of<CGAL::No_time_stamp<T3>,
|
||||
C3::Time_stamper>::value)
|
||||
{
|
||||
std::cerr << "Error timestamper of C3\n"; return 1;
|
||||
}
|
||||
if(! boost::is_base_of<CGAL::Time_stamper<T2>,
|
||||
if(! std::is_base_of<CGAL::Time_stamper<T2>,
|
||||
C4::Time_stamper>::value)
|
||||
{
|
||||
std::cerr << "Error timestamper of C4\n"; return 1;
|
||||
|
|
|
|||
Loading…
Reference in New Issue