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

Merge pull request #5420 from afabri/Kernel_d-equal_to-GF 

Kernel_d:   Deal with deprecated result_type
This commit is contained in:
Laurent Rineau 2021-03-03 17:33:07 +01:00
parent 3621aaaf3e ab5517e1ac
commit bcf3e18c69
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Kernel_d/include/CGAL/Kernel_d/Iso_box_d.h
View File

@ -25,6 +25,7 @@
#include <algorithm> #include <algorithm>
#include <numeric> #include <numeric>
#include <cstddef> #include <cstddef>
#include <iterator>
namespace CGAL { namespace CGAL {
@ -41,9 +42,11 @@ namespace CGAL {
typedef typename Point::Cartesian_const_iterator Iterator; typedef typename Point::Cartesian_const_iterator Iterator;
typedef Cartesian_iterator<Point,Functor> Self; typedef Cartesian_iterator<Point,Functor> Self;
typedef typename Functor::result_type value_type; typedef decltype(std::declval<Functor>()(
typedef value_type& reference; *std::declval<Iterator>(),
typedef value_type* pointer; *std::declval<Iterator>())) value_type;
typedef value_type reference;
typedef const value_type* pointer;
typedef std::ptrdiff_t difference_type; typedef std::ptrdiff_t difference_type;
typedef std::input_iterator_tag iterator_category; typedef std::input_iterator_tag iterator_category;
@ -89,7 +92,7 @@ namespace CGAL {
return tmp; return tmp;
} }
value_type operator*() const { return f(*pb, *qb); } reference operator*() const { return f(*pb, *qb); }
pointer operator->() const { return &(**this); } pointer operator->() const { return &(**this); }
const Functor& functor() const { return f; } const Functor& functor() const { return f; }
@ -118,9 +121,12 @@ namespace CGAL {
typedef typename Point::Homogeneous_const_iterator Iterator; typedef typename Point::Homogeneous_const_iterator Iterator;
typedef Homogeneous_iterator<Point,Functor> Self; typedef Homogeneous_iterator<Point,Functor> Self;
typedef typename Functor::result_type value_type; typedef typename Kernel_traits<Point>::Kernel::RT RT;
typedef value_type& reference; typedef decltype(std::declval<Functor>()(
typedef value_type* pointer; *std::declval<Iterator>() * std::declval<RT>(),
*std::declval<Iterator>() * std::declval<RT>())) value_type;
typedef value_type reference;
typedef const value_type* pointer;
typedef std::ptrdiff_t difference_type; typedef std::ptrdiff_t difference_type;
typedef std::input_iterator_tag iterator_category; typedef std::input_iterator_tag iterator_category;
@ -128,7 +134,6 @@ namespace CGAL {
Iterator pb, qb; Iterator pb, qb;
Functor f; Functor f;
typedef typename Kernel_traits<Point>::Kernel::RT RT;
RT hp, hq; // homogenizing coordinates RT hp, hq; // homogenizing coordinates
public: public: