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

Add 'using' for ansi compliance and fix a bug (discovered with Intel)

This commit is contained in:
Andreas Fabri 2010-05-11 09:38:53 +00:00
parent de80f0e8e5
commit c3f6b36e9c
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Convex_hull_d/include/CGAL/Convex_hull_d.h
View File

@ -269,12 +269,15 @@ class Convex_hull_d : public Regular_complex_d<R_>
typedef Regular_complex_d<R_> Base; typedef Regular_complex_d<R_> Base;
typedef Convex_hull_d<R_> Self; typedef Convex_hull_d<R_> Self;
using Base::new_simplex;
public: public:
using Base::kernel; using Base::new_simplex;
using Base::dcur; using Base::new_vertex;
using Base::associate_vertex_with_simplex;
using Base::set_neighbor;
using Base::kernel;
using Base::dcur;
/*{\Xgeneralization Regular_complex_d<R>}*/ /*{\Xgeneralization Regular_complex_d<R>}*/
/*{\Mtypes 6.5}*/ /*{\Mtypes 6.5}*/

5
Convex_hull_d/include/CGAL/Delaunay_d.h
View File

@ -93,11 +93,12 @@ class Delaunay_d : public Convex_hull_d<Lifted_R_>
typedef Delaunay_d<R_,Lifted_R_> Self; typedef Delaunay_d<R_,Lifted_R_> Self;
typedef Convex_hull_d<Lifted_R_> Base; typedef Convex_hull_d<Lifted_R_> Base;
using Base::origin_simplex_; using Base::origin_simplex_;
public: public:
using Base::dcur; using Base::associate_vertex_with_simplex;
using Base::dcur;
/*{\Mgeneralization Convex_hull_d<Lifted_R>}*/ /*{\Mgeneralization Convex_hull_d<Lifted_R>}*/

4
Convex_hull_d/include/CGAL/Regular_complex_d.h
View File

@ -567,8 +567,8 @@ intersection of any two simplices is a facet of both.}*/
typedef size_t Size_type; typedef size_t Size_type;
Size_type number_of_vertices() const { return this->_vertices.size();} Size_type number_of_vertices() const { return this->vertices_.size();}
Size_type number_of_simplices() const { return this->_simplices.size();} Size_type number_of_simplices() const { return this->simplices_.size();}
void print_statistics(std::ostream& os = std::cout) const void print_statistics(std::ostream& os = std::cout) const
{ {