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

Use boost::lambda::constant() - thank you Philipp

This commit is contained in:
Andreas Fabri 2016-04-25 21:25:16 +02:00 committed by Sébastien Loriot
parent 6b8421a048
commit b56c436ee6
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AABB_tree/examples/AABB_tree/AABB_ray_shooting_example.cpp
View File

@ -59,7 +59,7 @@ int main(int argc, char* argv[])
Vector v = CGAL::Polygon_mesh_processing::compute_face_normal(fd,mesh); Vector v = CGAL::Polygon_mesh_processing::compute_face_normal(fd,mesh);
Ray ray(p,d * v); Ray ray(p,d * v);
Ray_intersection intersection = tree.first_intersection(ray, Skip(fd)); Ray_intersection intersection = tree.first_intersection(ray);
if(intersection){ if(intersection){
if(boost::get<Point>(&(intersection->first))){ if(boost::get<Point>(&(intersection->first))){
const Point* p = boost::get<Point>(&(intersection->first) ); const Point* p = boost::get<Point>(&(intersection->first) );

10
AABB_tree/include/CGAL/AABB_tree.h
View File

@ -29,6 +29,7 @@
#include <CGAL/internal/AABB_tree/Has_nested_type_Shared_data.h> #include <CGAL/internal/AABB_tree/Has_nested_type_Shared_data.h>
#include <CGAL/internal/AABB_tree/Primitive_helper.h> #include <CGAL/internal/AABB_tree/Primitive_helper.h>
#include <boost/optional.hpp> #include <boost/optional.hpp>
#include <boost/lambda/lambda.hpp>
#ifdef CGAL_HAS_THREADS #ifdef CGAL_HAS_THREADS
#include <CGAL/mutex.h> #include <CGAL/mutex.h>
@ -395,11 +396,6 @@ public:
any_intersection(const Query& query) const; any_intersection(const Query& query) const;
struct False_functor {
template <typename T>
bool operator()(const T&) const
{ return false;}
};
/// Returns the intersection and primitive id closest to the source point of the ray /// Returns the intersection and primitive id closest to the source point of the ray
/// query. /// query.
@ -421,7 +417,7 @@ public:
boost::optional< typename Intersection_and_primitive_id<Ray>::Type > boost::optional< typename Intersection_and_primitive_id<Ray>::Type >
first_intersection(const Ray& query) const first_intersection(const Ray& query) const
{ {
return first_intersection(query, False_functor()); return first_intersection(query, boost::lambda::constant(false));
} }
/// Returns the primitive id closest to the source point of the ray /// Returns the primitive id closest to the source point of the ray
@ -444,7 +440,7 @@ public:
boost::optional<Primitive_id> boost::optional<Primitive_id>
first_intersected_primitive(const Ray& query) const first_intersected_primitive(const Ray& query) const
{ {
return first_intersected_primitive(query, False_functor()); return first_intersected_primitive(query, boost::lambda::constant(false));
} }
///@} ///@}