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

Misc minor changes

This commit is contained in:
Mael Rouxel-Labbé 2017-05-01 16:15:31 +02:00
parent 11a5bb7104
commit 9eac14e40c
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Triangulation_3/include/CGAL/Regular_triangulation_3.h
View File

@ -43,7 +43,6 @@
# include <tbb/concurrent_vector.h>
#endif
#include <CGAL/Triangulation_3.h>
#include <CGAL/Regular_triangulation_vertex_base_3.h>
#include <CGAL/Regular_triangulation_cell_base_3.h>
@ -1850,7 +1849,7 @@ namespace CGAL {
// We sort the points lexicographically.
const Weighted_point * points[5] = {&p0, &p1, &p2, &p3, &p};
// boost::bind is used twice, to grab the Bare_point within the Weighted_point*
// boost::bind is used twice, to grab the Bare_point within the Weighted_point*.
// `result_of` is used to go around the way the Lazy kernel works
// (simply grabbing it as a `const Bare_point&` would not work)
std::sort(points, points + 5,
@ -1969,7 +1968,7 @@ namespace CGAL {
// We sort the points lexicographically.
const Weighted_point * points[4] = {&p0, &p1, &p2, &p};
// boost::bind is used twice, to grab the Bare_point within the Weighted_point*
// boost::bind is used twice, to grab the Bare_point within the Weighted_point*.
// `result_of` is used to go around the way the Lazy kernel works
// (simply grabbing it as a `const Bare_point&` would not work)
std::sort(points, points + 4,

7
Triangulation_3/include/CGAL/Triangulation_hierarchy_3.h
View File

@ -46,6 +46,9 @@
#include <boost/tuple/tuple.hpp>
#include <boost/iterator/zip_iterator.hpp>
#include <boost/mpl/and.hpp>
#include <boost/mpl/identity.hpp>
#include <boost/mpl/if.hpp>
#endif //CGAL_TRIANGULATION_3_DONT_INSERT_RANGE_OF_POINTS_WITH_INFO
namespace CGAL {
@ -72,7 +75,6 @@ public:
typedef Tr Tr_Base;
typedef Fast_location Location_policy;
typedef typename Tr_Base::Geom_traits Geom_traits;
typedef typename Tr_Base::Point Point;
typedef typename Tr_Base::size_type size_type;
typedef typename Tr_Base::Vertex_handle Vertex_handle;
typedef typename Tr_Base::Cell_handle Cell_handle;
@ -84,6 +86,9 @@ public:
typedef typename Tr_Base::Finite_facets_iterator Finite_facets_iterator;
typedef typename Tr_Base::Finite_edges_iterator Finite_edges_iterator;
// this may be weighted or not
typedef typename Tr_Base::Point Point;
using Tr_Base::number_of_vertices;
using Tr_Base::geom_traits;