From 79f9d82389b77730c855f2dfdc4f37b5d2f69710 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= <sebastien.loriot@cgal.org>
Date: Fri, 6 May 2022 14:52:32 +0200
Subject: [PATCH] use _v prefixed version

---
 .../include/CGAL/Box_intersection_d/segment_tree.h    | 11 +++++++----
 Installation/include/CGAL/config.h                    |  6 ++++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Box_intersection_d/include/CGAL/Box_intersection_d/segment_tree.h b/Box_intersection_d/include/CGAL/Box_intersection_d/segment_tree.h
index 098e92ea2b1..fae47c57812 100644
--- a/Box_intersection_d/include/CGAL/Box_intersection_d/segment_tree.h
+++ b/Box_intersection_d/include/CGAL/Box_intersection_d/segment_tree.h
@@ -325,9 +325,12 @@ public:
   static const bool value = (sizeof(f<T>(0)) == sizeof(char));
 };
 
+template <class T>
+CGAL_CPP17_INLINE constexpr bool Has_member_report_v = Has_member_report<T>::value;
+
 template <typename Callback>
 inline
-std::enable_if_t<Has_member_report<Callback>::value, bool>
+std::enable_if_t<Has_member_report_v<Callback>, bool>
 report_impl(Callback callback, int dim)
 {
   return callback.report(dim);
@@ -335,7 +338,7 @@ report_impl(Callback callback, int dim)
 
 template <typename Callback>
 inline
-std::enable_if_t<!Has_member_report<Callback>::value, bool>
+std::enable_if_t<!Has_member_report_v<Callback>, bool>
 report_impl(const Callback&, int)
 {
   return false;
@@ -343,7 +346,7 @@ report_impl(const Callback&, int)
 
 template <typename Callback>
 inline
-std::enable_if_t<Has_member_report<Callback>::value, void>
+std::enable_if_t<Has_member_report_v<Callback>, void>
 progress_impl(Callback callback, double d)
 {
   callback.progress(d);
@@ -351,7 +354,7 @@ progress_impl(Callback callback, double d)
 
 template <typename Callback>
 inline
-std::enable_if_t<!Has_member_report<Callback>::value, void>
+std::enable_if_t<!Has_member_report_v<Callback>, void>
 progress_impl(const Callback&, double)
 {}
 
diff --git a/Installation/include/CGAL/config.h b/Installation/include/CGAL/config.h
index a6348c7d617..94f2fba8b4f 100644
--- a/Installation/include/CGAL/config.h
+++ b/Installation/include/CGAL/config.h
@@ -499,6 +499,12 @@ namespace cpp11{
 #  define CGAL_FALLTHROUGH while(false){}
 #endif
 
+#if CGAL_CXX17
+#  define CGAL_CPP17_INLINE inline
+#else
+#  define CGAL_CPP17_INLINE
+#endif
+
 #ifndef CGAL_NO_ASSERTIONS
 #  define CGAL_NO_ASSERTIONS_BOOL false
 #else