From 480c14564a00a4a51d5b8ec9bd752b9aab4455f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?=
 <mael.rouxel.labbe@geometryfactory.com>
Date: Fri, 8 Oct 2021 15:42:01 +0200
Subject: [PATCH] Don't base reference detection on lvalue_property_map_tag

---
 .../include/CGAL/Search_traits_adapter.h      | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/Spatial_searching/include/CGAL/Search_traits_adapter.h b/Spatial_searching/include/CGAL/Search_traits_adapter.h
index d3c6b49fd60..0d3d30f5de0 100644
--- a/Spatial_searching/include/CGAL/Search_traits_adapter.h
+++ b/Spatial_searching/include/CGAL/Search_traits_adapter.h
@@ -232,19 +232,16 @@ public:
 
   // Select type of iterator + construct class depending on whether
   // point map is lvalue or not
-  typedef typename boost::mpl::if_
-            <boost::is_same
-              <boost::lvalue_property_map_tag,
-               typename boost::property_traits<PointPropertyMap>::category >,
-               typename Base::Cartesian_const_iterator_d,
-               No_lvalue_iterator>::type
+  typedef typename boost::mpl::if_<
+              boost::is_reference<typename boost::property_traits<PointPropertyMap>::reference>,
+              typename Base::Cartesian_const_iterator_d,
+              No_lvalue_iterator>::type
     Cartesian_const_iterator_d;
-  typedef typename boost::mpl::if_
-            <boost::is_same
-              <boost::lvalue_property_map_tag,
-               typename boost::property_traits<PointPropertyMap>::category >,
-             Construct_cartesian_const_iterator_d_lvalue,
-             Construct_cartesian_const_iterator_d_no_lvalue>::type
+
+  typedef typename boost::mpl::if_<
+              boost::is_reference<typename boost::property_traits<PointPropertyMap>::reference>,
+              Construct_cartesian_const_iterator_d_lvalue,
+              Construct_cartesian_const_iterator_d_no_lvalue>::type
     Construct_cartesian_const_iterator_d;
 
   struct Construct_iso_box_d: public Base::Construct_iso_box_d{