From 8e7512538396563b59ce789d1ceda25dffb6712b Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Mon, 21 Jun 2010 13:19:03 +0000 Subject: [PATCH] int -> size_type/std::size_t --- .../Constrained_Delaunay_triangulation_2.tex | 2 +- .../Constrained_triangulation_2.tex | 2 +- .../Constrained_triangulation_plus_2.tex | 2 +- .../Delaunay_triangulation_2.tex | 2 +- .../Regular_triangulation_2.tex | 2 +- .../Triangulation_2_ref/Triangulation_2.tex | 2 +- .../Constrained_Delaunay_triangulation_2.h | 9 +- .../CGAL/Constrained_triangulation_2.h | 7 +- .../CGAL/Constrained_triangulation_plus_2.h | 8 +- .../include/CGAL/Constraint_hierarchy_2.h | 10 +- .../include/CGAL/Delaunay_triangulation_2.h | 33 ++--- .../include/CGAL/Regular_triangulation_2.h | 4 +- .../include/CGAL/Triangulation_2.h | 128 +++++++++--------- .../include/CGAL/Triangulation_hierarchy_2.h | 4 +- .../_test_cls_const_Del_triangulation_2.h | 2 +- .../CGAL/_test_cls_delaunay_triangulation_2.h | 2 +- .../include/CGAL/_test_cls_hierarchy_2.h | 4 +- .../CGAL/_test_cls_regular_triangulation_2.h | 2 +- .../include/CGAL/_test_cls_triangulation_2.h | 2 +- .../CGAL/_test_cls_triangulation_short_2.h | 2 +- .../CGAL/_test_triangulation_circulators.h | 6 +- .../CGAL/_test_triangulation_iterators.h | 4 +- .../test_delaunay_triangulation_2.cpp | 14 ++ 23 files changed, 135 insertions(+), 118 deletions(-) diff --git a/Triangulation_2/doc_tex/Triangulation_2_ref/Constrained_Delaunay_triangulation_2.tex b/Triangulation_2/doc_tex/Triangulation_2_ref/Constrained_Delaunay_triangulation_2.tex index d65d75ede0b..c65a6ac430c 100644 --- a/Triangulation_2/doc_tex/Triangulation_2_ref/Constrained_Delaunay_triangulation_2.tex +++ b/Triangulation_2/doc_tex/Triangulation_2_ref/Constrained_Delaunay_triangulation_2.tex @@ -164,7 +164,7 @@ for the location of \ccc{p}.} {Equivalent to \ccc{insert(p)}.} \ccMethod{template < class InputIterator > - int + size_type insert(InputIterator first, InputIterator last);} {Inserts the points in the range $\left[\right.$\ccc{first}, \ccc{last}$\left.\right)$. diff --git a/Triangulation_2/doc_tex/Triangulation_2_ref/Constrained_triangulation_2.tex b/Triangulation_2/doc_tex/Triangulation_2_ref/Constrained_triangulation_2.tex index 43d0db413ca..31ccaa4b103 100644 --- a/Triangulation_2/doc_tex/Triangulation_2_ref/Constrained_triangulation_2.tex +++ b/Triangulation_2/doc_tex/Triangulation_2_ref/Constrained_triangulation_2.tex @@ -204,7 +204,7 @@ for the location of \ccc{p}.} {Equivalent to \ccc{insert(p)}.} \ccMethod{template < class InputIterator > - int + size_type insert(InputIterator first, InputIterator last);} {Inserts the points in the range $\left[\right.$\ccc{first}, \ccc{last}$\left.\right)$. diff --git a/Triangulation_2/doc_tex/Triangulation_2_ref/Constrained_triangulation_plus_2.tex b/Triangulation_2/doc_tex/Triangulation_2_ref/Constrained_triangulation_plus_2.tex index 13194bc4ec5..d27b934fd9e 100644 --- a/Triangulation_2/doc_tex/Triangulation_2_ref/Constrained_triangulation_plus_2.tex +++ b/Triangulation_2/doc_tex/Triangulation_2_ref/Constrained_triangulation_plus_2.tex @@ -155,7 +155,7 @@ to be given by \ccc{(lt,loc,li)}.} {Equivalent to \ccc{insert(p)}.} \ccMethod{template < class InputIterator > - int + size_type insert(InputIterator first, InputIterator last);} {Inserts the points in the range $\left[\right.$\ccc{first}, \ccc{last}$\left.\right)$. diff --git a/Triangulation_2/doc_tex/Triangulation_2_ref/Delaunay_triangulation_2.tex b/Triangulation_2/doc_tex/Triangulation_2_ref/Delaunay_triangulation_2.tex index 8b9f6001047..750f90eb456 100644 --- a/Triangulation_2/doc_tex/Triangulation_2_ref/Delaunay_triangulation_2.tex +++ b/Triangulation_2/doc_tex/Triangulation_2_ref/Delaunay_triangulation_2.tex @@ -122,7 +122,7 @@ given by \ccc{(lt,loc,li)}, see the description of member function {equivalent to \ccc{insert(p)}.} \ccMethod{template < class InputIterator > - int + size_type insert(InputIterator first, InputIterator last);} {inserts the points in the range $\left[\right.$\ccc{first}, \ccc{last}$\left.\right)$. diff --git a/Triangulation_2/doc_tex/Triangulation_2_ref/Regular_triangulation_2.tex b/Triangulation_2/doc_tex/Triangulation_2_ref/Regular_triangulation_2.tex index 4816186111d..eca2f294c24 100644 --- a/Triangulation_2/doc_tex/Triangulation_2_ref/Regular_triangulation_2.tex +++ b/Triangulation_2/doc_tex/Triangulation_2_ref/Regular_triangulation_2.tex @@ -206,7 +206,7 @@ located in \ccc{lt,loc,li}.} {Equivalent to \ccc{insert(p)}.} \ccMethod{template < class InputIterator > - int + size_type insert(InputIterator first, InputIterator last);} {inserts the weighted points in the range $\left[\right.$\ccc{first}, \ccc{last}$\left.\right)$. diff --git a/Triangulation_2/doc_tex/Triangulation_2_ref/Triangulation_2.tex b/Triangulation_2/doc_tex/Triangulation_2_ref/Triangulation_2.tex index 7b9241748bd..ac293b3fc57 100644 --- a/Triangulation_2/doc_tex/Triangulation_2_ref/Triangulation_2.tex +++ b/Triangulation_2/doc_tex/Triangulation_2_ref/Triangulation_2.tex @@ -496,7 +496,7 @@ algorithm of where to start. {Equivalent to \ccc{insert(p)}.} \ccMethod{template < class InputIterator > - int + size_type insert(InputIterator first, InputIterator last);} {Inserts the points in the range $\left[\right.$\ccc{first}, \ccc{last}$\left.\right)$. diff --git a/Triangulation_2/include/CGAL/Constrained_Delaunay_triangulation_2.h b/Triangulation_2/include/CGAL/Constrained_Delaunay_triangulation_2.h index 964482f9f46..fec0ba0d318 100644 --- a/Triangulation_2/include/CGAL/Constrained_Delaunay_triangulation_2.h +++ b/Triangulation_2/include/CGAL/Constrained_Delaunay_triangulation_2.h @@ -46,6 +46,7 @@ public: typedef typename Ctr::Edge Edge; typedef typename Ctr::Finite_faces_iterator Finite_faces_iterator; typedef typename Ctr::Face_circulator Face_circulator; + typedef typename Ctr::size_type size_type; typedef typename Ctr::Locate_type Locate_type; typedef typename Ctr::List_edges List_edges; @@ -152,7 +153,7 @@ public: Face_handle loc, int li ); Vertex_handle push_back(const Point& a); // template < class InputIterator > -// int insert(InputIterator first, InputIterator last); +// size_type insert(InputIterator first, InputIterator last); void remove(Vertex_handle v); void remove_incident_constraints(Vertex_handle v); @@ -190,12 +191,12 @@ public: public: template < class InputIterator > #if defined(_MSC_VER) - int insert(InputIterator first, InputIterator last, int i = 0) + size_type insert(InputIterator first, InputIterator last, int i = 0) #else - int insert(InputIterator first, InputIterator last) + size_type insert(InputIterator first, InputIterator last) #endif { - int n = number_of_vertices(); + size_type n = number_of_vertices(); std::vector points (first, last); spatial_sort (points.begin(), points.end(), geom_traits()); diff --git a/Triangulation_2/include/CGAL/Constrained_triangulation_2.h b/Triangulation_2/include/CGAL/Constrained_triangulation_2.h index ee4e6ee7a36..1df6641d1da 100644 --- a/Triangulation_2/include/CGAL/Constrained_triangulation_2.h +++ b/Triangulation_2/include/CGAL/Constrained_triangulation_2.h @@ -54,6 +54,7 @@ public: typedef typename Triangulation::Vertex Vertex; typedef typename Triangulation::Vertex_handle Vertex_handle; typedef typename Triangulation::Face_handle Face_handle; + typedef typename Triangulation::size_type size_type; typedef typename Triangulation::Locate_type Locate_type; typedef typename Triangulation::All_faces_iterator All_faces_iterator; typedef typename Triangulation::Face_circulator Face_circulator; @@ -254,12 +255,12 @@ public: // the int parameter is a work around for VC7 to compile template < class InputIterator > #if defined(_MSC_VER) - int insert(InputIterator first, InputIterator last, int i = 0) + size_type insert(InputIterator first, InputIterator last, int i = 0) #else - int insert(InputIterator first, InputIterator last) + size_type insert(InputIterator first, InputIterator last) #endif { - int n = number_of_vertices(); + size_type n = number_of_vertices(); std::vector points (first, last); CGAL::spatial_sort (points.begin(), points.end(), geom_traits()); diff --git a/Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h b/Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h index b19d07dfc73..572c630a0ac 100644 --- a/Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h +++ b/Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h @@ -135,7 +135,7 @@ public: void insert_constraint(Vertex_handle va, Vertex_handle vb); // template < class InputIterator > -// int insert(InputIterator first, InputIterator last); +// size_type insert(InputIterator first, InputIterator last); Vertex_handle push_back(const Point& a); void push_back(const Constraint& c); @@ -205,12 +205,12 @@ public: public: template < class InputIterator > #if defined(_MSC_VER) - int insert(InputIterator first, InputIterator last, int i = 0) + size_type insert(InputIterator first, InputIterator last, int i = 0) #else - int insert(InputIterator first, InputIterator last) + size_type insert(InputIterator first, InputIterator last) #endif { - int n = number_of_vertices(); + size_type n = number_of_vertices(); std::vector points (first, last); diff --git a/Triangulation_2/include/CGAL/Constraint_hierarchy_2.h b/Triangulation_2/include/CGAL/Constraint_hierarchy_2.h index 80481a122cb..38a8a7ad876 100644 --- a/Triangulation_2/include/CGAL/Constraint_hierarchy_2.h +++ b/Triangulation_2/include/CGAL/Constraint_hierarchy_2.h @@ -66,7 +66,7 @@ public: H_vertex_it vertices_begin() { return enclosing->begin();} H_vertex_it current() {return pos;} H_vertex_it vertices_end() {return enclosing->end();} - int number_of_vertices() {return enclosing->size();} + std::size_t number_of_vertices() {return enclosing->size();} }; typedef std::list H_context_list; typedef typename std::list::iterator H_context_iterator; @@ -114,11 +114,11 @@ public: void oriented_end(T va, T vb, T& vc) const; H_context context(T va, T vb); - int number_of_enclosing_constraints(T va, T vb); + std::size_t number_of_enclosing_constraints(T va, T vb); H_context_iterator contexts_begin(T va, T vb); H_context_iterator contexts_end(T va, T vb); - int number_of_constraints() { return c_to_sc_map.size();} - int number_of_subconstraints() {return sc_to_c_map.size();} + std::size_t number_of_constraints() { return c_to_sc_map.size();} + std::size_t number_of_subconstraints() {return sc_to_c_map.size();} // insert/remove @@ -338,7 +338,7 @@ context(T va, T vb) } template -int +std::size_t Constraint_hierarchy_2:: number_of_enclosing_constraints(T va, T vb) { diff --git a/Triangulation_2/include/CGAL/Delaunay_triangulation_2.h b/Triangulation_2/include/CGAL/Delaunay_triangulation_2.h index 791d4cd7073..1f43e5dc586 100644 --- a/Triangulation_2/include/CGAL/Delaunay_triangulation_2.h +++ b/Triangulation_2/include/CGAL/Delaunay_triangulation_2.h @@ -49,6 +49,7 @@ public: typedef Triangulation_2 Triangulation; + typedef typename Triangulation::size_type size_type; typedef typename Triangulation::Locate_type Locate_type; typedef typename Triangulation::Face_handle Face_handle; typedef typename Triangulation::Vertex_handle Vertex_handle; @@ -270,10 +271,10 @@ public: } template < class InputIterator > - int + size_type insert(InputIterator first, InputIterator last) { - int n = this->number_of_vertices(); + size_type n = this->number_of_vertices(); std::vector points (first, last); spatial_sort (points.begin(), points.end(), geom_traits()); @@ -2268,7 +2269,7 @@ move_if_no_collision(Vertex_handle v, const Point &p) { return v; } - int n_vertices = this->tds().number_of_vertices(); + size_type n_vertices = this->tds().number_of_vertices(); if((lt == Triangulation::OUTSIDE_AFFINE_HULL) && (dim == 1) && (n_vertices == 3)) { @@ -2342,19 +2343,19 @@ move_if_no_collision(Vertex_handle v, const Point &p) { // fixing pointer Face_circulator fc = this->incident_faces(inserted), done(fc); std::vector faces_pt; - faces_pt.reserve(16); + faces_pt.reserve(16); do { faces_pt.push_back(fc); } while(++fc != done); - int ss = faces_pt.size(); - for(int k=0; kindex(inserted); - f->set_vertex(i, v); - } - - v->set_point(p); - v->set_face(inserted->face()); - + std::size_t ss = faces_pt.size(); + for(std::size_t k=0; kindex(inserted); + f->set_vertex(i, v); + } + + v->set_point(p); + v->set_face(inserted->face()); + this->delete_vertex(inserted); return v; @@ -2472,7 +2473,7 @@ move_if_no_collision_and_give_new_faces(Vertex_handle v, return v; } - int n_vertices = this->tds().number_of_vertices(); + size_type n_vertices = this->tds().number_of_vertices(); if((lt == Triangulation::OUTSIDE_AFFINE_HULL) && (dim == 1) && (n_vertices == 3)) { diff --git a/Triangulation_2/include/CGAL/Regular_triangulation_2.h b/Triangulation_2/include/CGAL/Regular_triangulation_2.h index 9912d661e87..578185e1165 100644 --- a/Triangulation_2/include/CGAL/Regular_triangulation_2.h +++ b/Triangulation_2/include/CGAL/Regular_triangulation_2.h @@ -338,10 +338,10 @@ private: public: template < class InputIterator > - int + size_type insert(InputIterator first, InputIterator last) { - int n = number_of_vertices(); + size_type n = number_of_vertices(); std::vector points (first, last); spatial_sort (points.begin(), points.end(), geom_traits()); diff --git a/Triangulation_2/include/CGAL/Triangulation_2.h b/Triangulation_2/include/CGAL/Triangulation_2.h index 5e347c295f4..062f35b6294 100644 --- a/Triangulation_2/include/CGAL/Triangulation_2.h +++ b/Triangulation_2/include/CGAL/Triangulation_2.h @@ -274,7 +274,7 @@ public: Locate_type lt, Face_handle loc, int li ); // template < class InputIterator > -// int insert(InputIterator first, InputIterator last); +// size_type insert(InputIterator first, InputIterator last); Vertex_handle push_back(const Point& a); void remove_degree_3(Vertex_handle v, Face_handle f = Face_handle()); @@ -492,9 +492,9 @@ Stream& draw_triangulation(Stream& os) const } template < class InputIterator > -int insert(InputIterator first, InputIterator last) +size_type insert(InputIterator first, InputIterator last) { - int n = number_of_vertices(); + size_type n = number_of_vertices(); std::vector points (first, last); spatial_sort (points.begin(), points.end(), geom_traits()); @@ -1390,8 +1390,8 @@ make_hole ( Vertex_handle v, std::list & hole) to_delete.push_back(f); } while(fc != done); - int size = to_delete.size(); - for(int i=0; i & hole, to_delete.push_back(f); } while(fc != done); - int size = to_delete.size(); - for(int i=0; iset_point(p); @@ -2029,15 +2029,15 @@ move_if_no_collision(Vertex_handle v, const Point &p) { std::vector faces_pt; faces_pt.reserve(16); do { faces_pt.push_back(fc); } while(++fc != done); - int ss = faces_pt.size(); - for(int k=0; kindex(inserted); - f->set_vertex(i, v); - } - v->set_point(p); - v->set_face(inserted->face()); + std::size_t ss = faces_pt.size(); + for(std::size_t k=0; kindex(inserted); + f->set_vertex(i, v); + } + v->set_point(p); + v->set_face(inserted->face()); delete_vertex(inserted); return v; @@ -2049,12 +2049,12 @@ Triangulation_2:: move(Vertex_handle v, const Point &p) { CGAL_triangulation_precondition(!is_infinite(v)); if(v->point() == p) return v; - Vertex_handle w = move_if_no_collision(v,p); - if(w != v) { - remove(v); - return w; - } - return v; + Vertex_handle w = move_if_no_collision(v,p); + if(w != v) { + remove(v); + return w; + } + return v; } template @@ -2082,16 +2082,16 @@ move_if_no_collision_and_give_new_faces(Vertex_handle v, return v; } - int n_vertices = tds().number_of_vertices(); + int n_vertices = tds().number_of_vertices(); if((lt == OUTSIDE_AFFINE_HULL) && (dim == 1) && (n_vertices == 3)) { - v->set_point(p); + v->set_point(p); - for(All_faces_iterator afi = tds().face_iterator_base_begin(); - afi != tds().face_iterator_base_begin(); - afi++) *oif++ = afi; + for(All_faces_iterator afi = tds().face_iterator_base_begin(); + afi != tds().face_iterator_base_begin(); + afi++) *oif++ = afi; - return v; + return v; } if((lt != OUTSIDE_AFFINE_HULL) && (dim == 1)) { @@ -2121,37 +2121,37 @@ move_if_no_collision_and_give_new_faces(Vertex_handle v, v->set_face(inserted->face()); delete_vertex(inserted); } - *oif++ = v->face(); + *oif++ = v->face(); if(v->face()->neighbor(0)->has_vertex(v)) - *oif++ = v->face()->neighbor(0); + *oif++ = v->face()->neighbor(0); if(v->face()->neighbor(1)->has_vertex(v)) - *oif++ = v->face()->neighbor(1); + *oif++ = v->face()->neighbor(1); return v; } if((lt != OUTSIDE_AFFINE_HULL) && test_dim_down(v)) { - // verify if p and two static vertices are collinear in this case - int iinf; - Face_circulator finf = incident_faces(infinite_vertex()), fdone(finf); - do { - if(!finf->has_vertex(v)) - { - iinf = ~(finf->index(infinite_vertex())); - break; - } - } while(++finf != fdone); - if(this->orientation(finf->vertex(iinf&1)->point(), - finf->vertex(iinf&2)->point(), - p) == COLLINEAR) - { - v->set_point(p); - _tds.dim_down(loc, loc->index(v)); - return v; - } + // verify if p and two static vertices are collinear in this case + int iinf; + Face_circulator finf = incident_faces(infinite_vertex()), fdone(finf); + do { + if(!finf->has_vertex(v)) + { + iinf = ~(finf->index(infinite_vertex())); + break; + } + } while(++finf != fdone); + if(this->orientation(finf->vertex(iinf&1)->point(), + finf->vertex(iinf&2)->point(), + p) == COLLINEAR) + { + v->set_point(p); + _tds.dim_down(loc, loc->index(v)); + return v; + } - for(All_faces_iterator afi = tds().face_iterator_base_begin(); - afi != tds().face_iterator_base_begin(); - afi++) *oif++ = afi; + for(All_faces_iterator afi = tds().face_iterator_base_begin(); + afi != tds().face_iterator_base_begin(); + afi++) *oif++ = afi; } @@ -2166,21 +2166,21 @@ move_if_no_collision_and_give_new_faces(Vertex_handle v, fc = this->incident_faces(inserted), done(fc); std::vector faces_pt; - faces_pt.reserve(16); + faces_pt.reserve(16); do { faces_pt.push_back(fc); } while(++fc != done); - int ss = faces_pt.size(); - for(int k=0; kindex(inserted); - f->set_vertex(i, v); - } - v->set_point(p); - v->set_face(inserted->face()); + int ss = faces_pt.size(); + for(int k=0; kindex(inserted); + f->set_vertex(i, v); + } + v->set_point(p); + v->set_face(inserted->face()); delete_vertex(inserted); for(typename std::set::iterator ib = faces_set.begin(), - iend = faces_set.end(); ib != iend; ib++) *oif++ = *ib; + iend = faces_set.end(); ib != iend; ib++) *oif++ = *ib; return v; } diff --git a/Triangulation_2/include/CGAL/Triangulation_hierarchy_2.h b/Triangulation_2/include/CGAL/Triangulation_hierarchy_2.h index 2535558d445..3c594ba2cca 100644 --- a/Triangulation_2/include/CGAL/Triangulation_hierarchy_2.h +++ b/Triangulation_2/include/CGAL/Triangulation_hierarchy_2.h @@ -100,9 +100,9 @@ public: Vertex_handle push_back(const Point &p); template < class InputIterator > - int insert(InputIterator first, InputIterator last) + size_type insert(InputIterator first, InputIterator last) { - int n = this->number_of_vertices(); + size_type n = this->number_of_vertices(); std::vector points (first, last); CGAL::spatial_sort (points.begin(), points.end(), geom_traits()); diff --git a/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_const_Del_triangulation_2.h b/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_const_Del_triangulation_2.h index 6244cc904ea..84b784f2697 100644 --- a/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_const_Del_triangulation_2.h +++ b/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_const_Del_triangulation_2.h @@ -93,7 +93,7 @@ _test_cls_const_Del_triangulation(const Triangul&) std::back_inserter(hole_bd)); assert(hole_bd.size() == conflicts.size() + 2); conflicts.clear(); - unsigned int nch = hole_bd.size(); + std::size_t nch = hole_bd.size(); hole_bd.clear(); T2.find_conflicts(Point(0,1,2), hole_bd); assert(hole_bd.size() == nch); diff --git a/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_delaunay_triangulation_2.h b/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_delaunay_triangulation_2.h index 301a358faca..d317af3aaee 100644 --- a/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_delaunay_triangulation_2.h +++ b/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_delaunay_triangulation_2.h @@ -122,7 +122,7 @@ _test_cls_delaunay_triangulation_2( const Del & ) assert(conflicts.empty()); conflicts.clear(); T2.get_conflicts(Point(-1,-1,1), std::back_inserter(conflicts)); - unsigned int ns = conflicts.size(); + std::size_t ns = conflicts.size(); conflicts.clear(); T2.find_conflicts(Point(-1,-1,1), conflicts); assert(conflicts.size() == ns); diff --git a/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_hierarchy_2.h b/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_hierarchy_2.h index b50d6b71b5b..fdc73205eb5 100644 --- a/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_hierarchy_2.h +++ b/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_hierarchy_2.h @@ -119,8 +119,8 @@ _test_cls_hierarchy_2() assert( ch.number_of_constraints() == h.number_of_constraints()); assert( ch.number_of_subconstraints() == h.number_of_subconstraints()); ch.clear(); - int nc = h.number_of_constraints(); - int nsc = h.number_of_subconstraints(); + std::size_t nc = h.number_of_constraints(); + std::size_t nsc = h.number_of_subconstraints(); ch.swap(h); assert (ch.number_of_constraints() == nc); assert( ch.number_of_subconstraints() == nsc); diff --git a/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_regular_triangulation_2.h b/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_regular_triangulation_2.h index 30d4437b4e5..f5dfafc83cf 100644 --- a/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_regular_triangulation_2.h +++ b/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_regular_triangulation_2.h @@ -811,7 +811,7 @@ _test_cls_regular_triangulation_2( const Triangulation & ) T2_3_1.remove(V2_31_17); T2_3_1.is_valid(verbose); - int i; + Cls::size_type i; T2_5.clear(); assert( T2_5.number_of_vertices() == 0 ); diff --git a/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_triangulation_2.h b/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_triangulation_2.h index 7af8f3e1a27..d25d53d5abd 100644 --- a/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_triangulation_2.h +++ b/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_triangulation_2.h @@ -875,7 +875,7 @@ _test_cls_triangulation_2( const Triangul & ) T2_3.remove(v2_3_10); assert(T2_3.is_valid()); assert( T2_3.number_of_vertices() == 0 ); - int i; + Triangul::size_type i; for (i=T2_4.number_of_vertices(); i>0; i--) T2_4.remove(T2_4.finite_vertex()); assert( T2_4.number_of_vertices() == 0 ); diff --git a/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_triangulation_short_2.h b/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_triangulation_short_2.h index 60ddf052d35..418d8c358e2 100644 --- a/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_triangulation_short_2.h +++ b/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_triangulation_short_2.h @@ -509,7 +509,7 @@ _test_cls_triangulation_short_2( const Triangul &) T2_3.remove(v2_3_1); assert(T2_3.is_valid()); assert( T2_3.number_of_vertices() == 0 ); - int i; + Triangul::size_type i; for (i=T2_4.number_of_vertices(); i>0; i--) T2_4.remove(T2_4.finite_vertex()); assert( T2_4.number_of_vertices() == 0 ); diff --git a/Triangulation_2/test/Triangulation_2/include/CGAL/_test_triangulation_circulators.h b/Triangulation_2/test/Triangulation_2/include/CGAL/_test_triangulation_circulators.h index c52ec9d5c0f..f7ac9f0a976 100644 --- a/Triangulation_2/test/Triangulation_2/include/CGAL/_test_triangulation_circulators.h +++ b/Triangulation_2/test/Triangulation_2/include/CGAL/_test_triangulation_circulators.h @@ -117,9 +117,9 @@ _test_circulators( const Tr &T ) } //Check Total - int mf = T.number_of_faces() + nch; - int mv = T.number_of_vertices() +1; - int me ; + Tr::size_type mf = T.number_of_faces() + nch; + Tr::size_type mv = T.number_of_vertices() +1; + Tr::size_type me ; if (T.dimension() <= 0) me=0; else me = T.dimension() == 1 ? mv : 3*mv-6 ; diff --git a/Triangulation_2/test/Triangulation_2/include/CGAL/_test_triangulation_iterators.h b/Triangulation_2/test/Triangulation_2/include/CGAL/_test_triangulation_iterators.h index 7ffffe7dfb1..b2581596168 100644 --- a/Triangulation_2/test/Triangulation_2/include/CGAL/_test_triangulation_iterators.h +++ b/Triangulation_2/test/Triangulation_2/include/CGAL/_test_triangulation_iterators.h @@ -45,7 +45,7 @@ _test_iterators( const Triangulation &T ) } template < class Triangulation > -int +typename Triangulation::size_type _test_cls_face_iterator( const Triangulation &T ) { typedef typename Triangulation::Finite_faces_iterator @@ -140,7 +140,7 @@ _test_cls_point_iterator( Triangulation &T ) } assert( np == T.number_of_vertices() ); - int n=np; + size_type n=np; for (pit = T.points_end(); pit != T.points_begin(); --pit) diff --git a/Triangulation_2/test/Triangulation_2/test_delaunay_triangulation_2.cpp b/Triangulation_2/test/Triangulation_2/test_delaunay_triangulation_2.cpp index 8a69ebb16b9..1bf463c473f 100644 --- a/Triangulation_2/test/Triangulation_2/test_delaunay_triangulation_2.cpp +++ b/Triangulation_2/test/Triangulation_2/test_delaunay_triangulation_2.cpp @@ -20,6 +20,15 @@ // coordinator : INRIA Sophia-Antipolis // ============================================================================ #include + + +#if defined(BOOST_MSVC) +# pragma warning(push) +# pragma warning(disable:4661) // Explicit instantiation will not + // instatiate template member functions +#endif + + #include #include @@ -31,6 +40,7 @@ #include #include + // Explicit instantiation of the whole class : template class CGAL::Delaunay_triangulation_2; @@ -72,3 +82,7 @@ int main() std::cout << "done" << std::endl; return 0; } + +#if defined(BOOST_MSVC) +# pragma warning(pop) +#endif