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

Use boost::priority_queue

This commit is contained in:
Philipp Möller 2015-11-11 14:43:07 +01:00 committed by Sébastien Loriot
parent 8eded0292f
commit 901c27724b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
AABB_tree/include/CGAL/internal/AABB_tree/AABB_ray_intersection.h
View File

@ -22,11 +22,11 @@
#ifndef CGAL_AABB_RAY_INTERSECTION_H #ifndef CGAL_AABB_RAY_INTERSECTION_H
#define CGAL_AABB_RAY_INTERSECTION_H #define CGAL_AABB_RAY_INTERSECTION_H
#include <queue>
#include <functional> #include <functional>
#include <boost/optional.hpp> #include <boost/optional.hpp>
#include <boost/type_traits/is_same.hpp> #include <boost/type_traits/is_same.hpp>
#include <boost/variant/apply_visitor.hpp> #include <boost/variant/apply_visitor.hpp>
#include <boost/heap/priority_queue.hpp>
#include <CGAL/assertions.h> #include <CGAL/assertions.h>
@ -47,8 +47,8 @@ public:
// nb_primitives through a variable in each Node on the stack. In // nb_primitives through a variable in each Node on the stack. In
// BVH_node::traversal this is done through the function parameter // BVH_node::traversal this is done through the function parameter
// nb_primitives in the recursion. // nb_primitives in the recursion.
typedef std::priority_queue< Node_ptr_with_ft, std::vector<Node_ptr_with_ft>, typedef boost::heap::priority_queue< Node_ptr_with_ft, boost::heap::compare< std::greater<Node_ptr_with_ft> > >
std::greater<Node_ptr_with_ft> > Heap_type; Heap_type;
typename AABB_traits::Intersection typename AABB_traits::Intersection
intersection_obj = tree_.traits().intersection_object(); intersection_obj = tree_.traits().intersection_object();