Skip to content

Commit 79f9d82

Browse files
committed
use _v prefixed version
1 parent a186d52 commit 79f9d82

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

Box_intersection_d/include/CGAL/Box_intersection_d/segment_tree.h

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -325,33 +325,36 @@ class Has_member_report
325325
static const bool value = (sizeof(f<T>(0)) == sizeof(char));
326326
};
327327

328+
template <class T>
329+
CGAL_CPP17_INLINE constexpr bool Has_member_report_v = Has_member_report<T>::value;
330+
328331
template <typename Callback>
329332
inline
330-
std::enable_if_t<Has_member_report<Callback>::value, bool>
333+
std::enable_if_t<Has_member_report_v<Callback>, bool>
331334
report_impl(Callback callback, int dim)
332335
{
333336
return callback.report(dim);
334337
}
335338

336339
template <typename Callback>
337340
inline
338-
std::enable_if_t<!Has_member_report<Callback>::value, bool>
341+
std::enable_if_t<!Has_member_report_v<Callback>, bool>
339342
report_impl(const Callback&, int)
340343
{
341344
return false;
342345
}
343346

344347
template <typename Callback>
345348
inline
346-
std::enable_if_t<Has_member_report<Callback>::value, void>
349+
std::enable_if_t<Has_member_report_v<Callback>, void>
347350
progress_impl(Callback callback, double d)
348351
{
349352
callback.progress(d);
350353
}
351354

352355
template <typename Callback>
353356
inline
354-
std::enable_if_t<!Has_member_report<Callback>::value, void>
357+
std::enable_if_t<!Has_member_report_v<Callback>, void>
355358
progress_impl(const Callback&, double)
356359
{}
357360

Installation/include/CGAL/config.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -499,6 +499,12 @@ namespace cpp11{
499499
# define CGAL_FALLTHROUGH while(false){}
500500
#endif
501501

502+
#if CGAL_CXX17
503+
# define CGAL_CPP17_INLINE inline
504+
#else
505+
# define CGAL_CPP17_INLINE
506+
#endif
507+
502508
#ifndef CGAL_NO_ASSERTIONS
503509
# define CGAL_NO_ASSERTIONS_BOOL false
504510
#else

0 commit comments

Comments
 (0)