std++14 style enable_if

This commit is contained in:
Sébastien Loriot 2022-06-07 20:57:57 +02:00
parent 8c13bdaea3
commit 7ba4fbcaab
2 changed files with 5 additions and 10 deletions

View File

@ -238,8 +238,7 @@ inline bool do_intersect(const General_polygon_with_holes_2<Polygon_>& pgn1,
template <typename InputIterator, typename Traits> template <typename InputIterator, typename Traits>
inline bool do_intersect(InputIterator begin, InputIterator end, Traits& traits, inline bool do_intersect(InputIterator begin, InputIterator end, Traits& traits,
unsigned int k=5, unsigned int k=5,
typename boost::enable_if std::enable_if_t<CGAL::is_iterator<InputIterator>::value>* = 0)
<typename CGAL::is_iterator<InputIterator>>::type* = 0)
{ return r_do_intersect(begin, end, traits, k); } { return r_do_intersect(begin, end, traits, k); }
// Without Traits // Without Traits
@ -247,8 +246,7 @@ inline bool do_intersect(InputIterator begin, InputIterator end, Traits& traits,
template <typename InputIterator> template <typename InputIterator>
inline bool do_intersect(InputIterator begin, InputIterator end, inline bool do_intersect(InputIterator begin, InputIterator end,
Tag_true = Tag_true(), unsigned int k=5, Tag_true = Tag_true(), unsigned int k=5,
typename boost::enable_if std::enable_if_t<CGAL::is_iterator<InputIterator>::value>* = 0,
<typename CGAL::is_iterator<InputIterator>>::type* = 0,
Enable_if_Polygon_2_iterator<InputIterator>* = 0) Enable_if_Polygon_2_iterator<InputIterator>* = 0)
{ return r_do_intersect(begin, end, k); } { return r_do_intersect(begin, end, k); }
@ -256,8 +254,7 @@ inline bool do_intersect(InputIterator begin, InputIterator end,
template <typename InputIterator> template <typename InputIterator>
inline bool do_intersect(InputIterator begin, InputIterator end, inline bool do_intersect(InputIterator begin, InputIterator end,
Tag_false, unsigned int k=5, Tag_false, unsigned int k=5,
typename boost::enable_if std::enable_if_t<CGAL::is_iterator<InputIterator>::value>* = 0,
<typename CGAL::is_iterator<InputIterator>>::type* = 0,
Enable_if_Polygon_2_iterator<InputIterator>* = 0) Enable_if_Polygon_2_iterator<InputIterator>* = 0)
{ {
typename Iterator_to_gps_traits<InputIterator>::Traits traits; typename Iterator_to_gps_traits<InputIterator>::Traits traits;
@ -268,8 +265,7 @@ inline bool do_intersect(InputIterator begin, InputIterator end,
template <typename InputIterator> template <typename InputIterator>
inline bool do_intersect(InputIterator begin, InputIterator end, inline bool do_intersect(InputIterator begin, InputIterator end,
unsigned int k=5, unsigned int k=5,
typename boost::enable_if std::enable_if_t<CGAL::is_iterator<InputIterator>::value>* = 0,
<typename CGAL::is_iterator<InputIterator>>::type* = 0,
Disable_if_Polygon_2_iterator<InputIterator>* = 0) Disable_if_Polygon_2_iterator<InputIterator>* = 0)
{ {
typename Iterator_to_gps_traits<InputIterator>::Traits traits; typename Iterator_to_gps_traits<InputIterator>::Traits traits;

View File

@ -288,8 +288,7 @@ inline OutputIterator
intersection(InputIterator begin, InputIterator end, intersection(InputIterator begin, InputIterator end,
OutputIterator oi, unsigned int k=5, OutputIterator oi, unsigned int k=5,
// workaround to avoid ambiguous calls with kernel functions // workaround to avoid ambiguous calls with kernel functions
typename boost::enable_if std::enable_if_t<CGAL::is_iterator<InputIterator>::value>* = 0,
<typename CGAL::is_iterator<InputIterator>>::type* = 0,
Disable_if_Polygon_2_iterator<InputIterator>* = 0) Disable_if_Polygon_2_iterator<InputIterator>* = 0)
{ {
typename Iterator_to_gps_traits<InputIterator>::Traits traits; typename Iterator_to_gps_traits<InputIterator>::Traits traits;