Skip to content

Commit 7ba4fbc

Browse files
committed
std++14 style enable_if
1 parent 8c13bda commit 7ba4fbc

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/do_intersect.h

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -238,26 +238,23 @@ inline bool do_intersect(const General_polygon_with_holes_2<Polygon_>& pgn1,
238238
template <typename InputIterator, typename Traits>
239239
inline bool do_intersect(InputIterator begin, InputIterator end, Traits& traits,
240240
unsigned int k=5,
241-
typename boost::enable_if
242-
<typename CGAL::is_iterator<InputIterator>>::type* = 0)
241+
std::enable_if_t<CGAL::is_iterator<InputIterator>::value>* = 0)
243242
{ return r_do_intersect(begin, end, traits, k); }
244243

245244
// Without Traits
246245
// Tag_true => convert to polylines
247246
template <typename InputIterator>
248247
inline bool do_intersect(InputIterator begin, InputIterator end,
249248
Tag_true = Tag_true(), unsigned int k=5,
250-
typename boost::enable_if
251-
<typename CGAL::is_iterator<InputIterator>>::type* = 0,
249+
std::enable_if_t<CGAL::is_iterator<InputIterator>::value>* = 0,
252250
Enable_if_Polygon_2_iterator<InputIterator>* = 0)
253251
{ return r_do_intersect(begin, end, k); }
254252

255253
// Tag_false => do not convert to polylines
256254
template <typename InputIterator>
257255
inline bool do_intersect(InputIterator begin, InputIterator end,
258256
Tag_false, unsigned int k=5,
259-
typename boost::enable_if
260-
<typename CGAL::is_iterator<InputIterator>>::type* = 0,
257+
std::enable_if_t<CGAL::is_iterator<InputIterator>::value>* = 0,
261258
Enable_if_Polygon_2_iterator<InputIterator>* = 0)
262259
{
263260
typename Iterator_to_gps_traits<InputIterator>::Traits traits;
@@ -268,8 +265,7 @@ inline bool do_intersect(InputIterator begin, InputIterator end,
268265
template <typename InputIterator>
269266
inline bool do_intersect(InputIterator begin, InputIterator end,
270267
unsigned int k=5,
271-
typename boost::enable_if
272-
<typename CGAL::is_iterator<InputIterator>>::type* = 0,
268+
std::enable_if_t<CGAL::is_iterator<InputIterator>::value>* = 0,
273269
Disable_if_Polygon_2_iterator<InputIterator>* = 0)
274270
{
275271
typename Iterator_to_gps_traits<InputIterator>::Traits traits;

Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/intersection.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,8 +288,7 @@ inline OutputIterator
288288
intersection(InputIterator begin, InputIterator end,
289289
OutputIterator oi, unsigned int k=5,
290290
// workaround to avoid ambiguous calls with kernel functions
291-
typename boost::enable_if
292-
<typename CGAL::is_iterator<InputIterator>>::type* = 0,
291+
std::enable_if_t<CGAL::is_iterator<InputIterator>::value>* = 0,
293292
Disable_if_Polygon_2_iterator<InputIterator>* = 0)
294293
{
295294
typename Iterator_to_gps_traits<InputIterator>::Traits traits;

0 commit comments

Comments
 (0)