From 21cda32aef14a14d9b34d1bd3546131859398efa Mon Sep 17 00:00:00 2001
From: Laurent Rineau <laurent.rineau@cgal.org>
Date: Tue, 9 Feb 2021 09:27:02 +0100
Subject: [PATCH] Simplify `value_type` and change `reference`

---
 Kernel_d/include/CGAL/Kernel_d/Iso_box_d.h | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/Kernel_d/include/CGAL/Kernel_d/Iso_box_d.h b/Kernel_d/include/CGAL/Kernel_d/Iso_box_d.h
index 3964fa2ada7..402ef35b8f5 100644
--- a/Kernel_d/include/CGAL/Kernel_d/Iso_box_d.h
+++ b/Kernel_d/include/CGAL/Kernel_d/Iso_box_d.h
@@ -42,15 +42,11 @@ namespace CGAL {
     typedef typename Point::Cartesian_const_iterator  Iterator;
     typedef Cartesian_iterator<Point,Functor>         Self;
 
-
-    typedef typename std::iterator_traits<Iterator>::value_type
-                                                      Coordinate_type;
-
-    typedef decltype(
-        std::declval<Functor>()(std::declval<Coordinate_type>(),
-                                std::declval<Coordinate_type>())) value_type;
-    typedef value_type&                    reference;
-    typedef value_type*                    pointer;
+    typedef decltype(std::declval<Functor>()(
+        *std::declval<Iterator>(),
+        *std::declval<Iterator>()))        value_type;
+    typedef value_type                     reference;
+    typedef const value_type*              pointer;
     typedef std::ptrdiff_t                 difference_type;
     typedef std::input_iterator_tag        iterator_category;
 
@@ -96,7 +92,7 @@ namespace CGAL {
       return tmp;
     }
 
-    value_type operator*()  const { return f(*pb, *qb); }
+    reference  operator*()  const { return f(*pb, *qb); }
     pointer    operator->() const { return &(**this); }
 
     const Functor& functor() const { return f; }