songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #680 from sloriot/SMS-boost_1.60 

Surface mesh segmentation: boost 1.60 compatibility
This commit is contained in:
Sebastien Loriot 2016-01-27 13:39:12 +01:00
parent c2099f758c 5614ed7500
commit 49e7ea6f58
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/AABB_traits.h
View File

@ -45,10 +45,8 @@ public:
// activate functions below if K::FT is floating point and fast_bbox_intersection = true // activate functions below if K::FT is floating point and fast_bbox_intersection = true
template <class K> template <class K>
typename boost::enable_if< typename boost::enable_if_c<
boost::type_traits::ice_and< boost::is_floating_point<typename K::FT>::value && fast_bbox_intersection,
boost::is_floating_point<typename K::FT>::value,
fast_bbox_intersection>,
bool >::type bool >::type
operator()(const CGAL::Segment_3<K>& segment, const Bounding_box& bbox) const { operator()(const CGAL::Segment_3<K>& segment, const Bounding_box& bbox) const {
const Point_3& p = segment.source(); const Point_3& p = segment.source();
@ -65,10 +63,8 @@ public:
} }
template <class K> template <class K>
typename boost::enable_if< typename boost::enable_if_c<
boost::type_traits::ice_and< boost::is_floating_point<typename K::FT>::value && fast_bbox_intersection,
boost::is_floating_point<typename K::FT>::value,
fast_bbox_intersection>,
bool >::type bool >::type
operator()(const CGAL::Ray_3<K>& ray, const Bounding_box& bbox) const { operator()(const CGAL::Ray_3<K>& ray, const Bounding_box& bbox) const {
const Point_3& p = ray.source(); const Point_3& p = ray.source();