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

Merge branch 'Triangulation-higher_dimensions-odevil_shornus' of ssh://scm.cgal.org/var/git/cgal into Triangulation-higher_dimensions-odevil_shornus

This commit is contained in:
Clement Jamin 2014-04-04 22:55:02 +02:00
parent b4b05769fd 4a321e57d2
commit 144d03f08f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Triangulation/include/CGAL/Delaunay_triangulation.h
View File

@ -304,9 +304,9 @@ public:
}
else
{
Substitute_point_in_vertex_iterator<
typename Full_cell::Vertex_handle_const_iterator>
spivi(dc_.infinite_vertex(), &p_);
typedef typename Full_cell::Vertex_handle_const_iterator VHCI;
typedef typename Base::template Substitute_point_in_vertex_iterator<VHCI> F;
F spivi(dc_.infinite_vertex(), &p_);
Orientation o = ori_(
boost::make_transform_iterator(s->vertices_begin(), spivi),
@ -462,8 +462,8 @@ Delaunay_triangulation<DCTraits, TDS>
Dark_triangulation dark_side(
maximal_dimension(),
flat_orientation_ ?
std::make_pair(current_dimension(), flat_orientation_.get_ptr())
: std::make_pair<int, const Flat_orientation_d *>(std::numeric_limits<int>::max(), NULL) );
std::pair<int, const Flat_orientation_d *>(current_dimension(), flat_orientation_.get_ptr())
: std::pair<int, const Flat_orientation_d *>(std::numeric_limits<int>::max(), NULL) );
Dark_s_handle dark_s;
Dark_v_handle dark_v;

2
Triangulation/include/CGAL/Triangulation.h
View File

@ -94,7 +94,7 @@ protected:
template<class VertexHandleConstIter>
class Substitute_point_in_vertex_iterator
{
typedef typename VertexHandleConstIter::value_type Vertex_handle;
typedef typename std::iterator_traits<VertexHandleConstIter>::value_type Vertex_handle;
typedef typename Vertex_handle::value_type Vertex;
typedef typename Vertex::Point Point;