Use canonical form for for-loops over iterator ranges.

Triangulation_3/include/CGAL/Delaunay_triangulation_3.h

@@ -894,7 +894,8 @@ nearest_vertex(const Point& p, Cell_handle start) const
     if (dimension() < 3) {
 	Finite_vertices_iterator vit = finite_vertices_begin();
 	Vertex_handle res = vit;
-	for (++vit; vit != finite_vertices_end(); ++vit)
+	++vit;
+	for (Finite_vertices_iterator end = finite_vertices_end(); vit != end; ++vit)
 	    res = nearest_vertex(p, res, vit);
 	return res;
     }
@@ -1096,10 +1097,9 @@ is_valid(bool verbose, int level) const
   switch ( dimension() ) {
   case 3:
     {
-      Finite_cells_iterator it;
-      for ( it = finite_cells_begin(); it != finite_cells_end(); ++it ) {
+      for(Finite_cells_iterator it = finite_cells_begin(), end = finite_cells_end(); it != end; ++it) {
 	is_valid_finite(it);
-	for (int i=0; i<4; i++ ) {
+	for(int i=0; i<4; i++ ) {
 	  if ( !is_infinite
 	       (it->neighbor(i)->vertex(it->neighbor(i)->index(it))) ) {
 	    if ( side_of_sphere
@@ -1118,10 +1118,9 @@ is_valid(bool verbose, int level) const
     }
   case 2:
     {
-      Finite_facets_iterator it;
-      for ( it = finite_facets_begin(); it != finite_facets_end(); ++it ) {
+      for(Finite_facets_iterator it = finite_facets_begin(), end = finite_facets_end(); it != end; ++it) {
 	is_valid_finite((*it).first);
-	for (int i=0; i<3; i++ ) {
+	for(int i=0; i<3; i++ ) {
 	  if( !is_infinite
 	      ((*it).first->neighbor(i)->vertex( (((*it).first)->neighbor(i))
 						 ->index((*it).first))) ) {
@@ -1142,8 +1141,7 @@ is_valid(bool verbose, int level) const
     }
   case 1:
     {
-      Finite_edges_iterator it;
-      for ( it = finite_edges_begin(); it != finite_edges_end(); ++it )
+      for(Finite_edges_iterator it = finite_edges_begin(), end = finite_edges_end(); it != end; ++it)
 	is_valid_finite((*it).first);
       break;
     }
@@ -1304,8 +1302,8 @@ fill_hole_3D_ear(const std::vector<Facet> & boundhole)
     // the two faces form a concavity, in which we might plug a cell
 
     // we now look at all vertices that are on the boundary of the hole
-    for(typename Surface::Vertex_iterator vit = surface.vertices_begin();
-	vit != surface.vertices_end(); ++vit) {
+    for(typename Surface::Vertex_iterator vit = surface.vertices_begin(),
+	    end = surface.vertices_end(); vit != end; ++vit) {
       Vertex_handle v = vit->info();
       if (is_infinite(v) || v == v0 || v == v1 || v == v2 || v == v3)
 	  continue;

Triangulation_3/include/CGAL/Regular_triangulation_3.h

@@ -709,7 +709,8 @@ nearest_power_vertex(const Bare_point& p, Cell_handle start) const
     if (dimension() < 3) {
 	Finite_vertices_iterator vit = finite_vertices_begin();
 	Vertex_handle res = vit;
-	for (++vit; vit != finite_vertices_end(); ++vit)
+	++vit;
+	for (Finite_vertices_iterator end = finite_vertices_end(); vit != end; ++vit)
 	    res = nearest_power_vertex(p, res, vit);
 	return res;
     }
@@ -1294,10 +1295,9 @@ is_valid(bool verbose, int level) const
   switch ( dimension() ) {
   case 3:
     {
-      Finite_cells_iterator it;
-      for ( it = finite_cells_begin(); it != finite_cells_end(); ++it ) {
+      for(Finite_cells_iterator it = finite_cells_begin(), end = finite_cells_end(); it != end; ++it) {
 	is_valid_finite(it, verbose, level);
-	for (int i=0; i<4; i++ ) {
+	for(int i=0; i<4; i++) {
 	  if ( !is_infinite
 	       (it->neighbor(i)->vertex(it->neighbor(i)->index(it))) ) {
 	    if ( side_of_power_sphere
@@ -1316,10 +1316,9 @@ is_valid(bool verbose, int level) const
     }
   case 2:
     {
-      Finite_facets_iterator it;
-      for ( it = finite_facets_begin(); it != finite_facets_end(); ++it ) {
+      for(Finite_facets_iterator it = finite_facets_begin(), end = finite_facets_end(); it!= end; ++it) {
 	is_valid_finite((*it).first, verbose, level);
-	for (int i=0; i<3; i++ ) {
+	for(int i=0; i<3; i++) {
 	  if( !is_infinite
 	      ((*it).first->neighbor(i)->vertex( (((*it).first)->neighbor(i))
 						 ->index((*it).first))) ) {
@@ -1341,10 +1340,9 @@ is_valid(bool verbose, int level) const
     }
   case 1:
     {
-      Finite_edges_iterator it;
-      for ( it = finite_edges_begin(); it != finite_edges_end(); ++it ) {
+      for(Finite_edges_iterator it = finite_edges_begin(), end = finite_edges_end(); it != end; ++it) {
 	is_valid_finite((*it).first, verbose, level);
-	for (int i=0; i<2; i++ ) {
+	for(int i=0; i<2; i++) {
 	  if( !is_infinite
 	      ((*it).first->neighbor(i)->vertex( (((*it).first)->neighbor(i))
 						 ->index((*it).first))) ) {

Triangulation_3/include/CGAL/Triangulation_3.h

@@ -1225,7 +1225,8 @@ operator<< (std::ostream& os, const Triangulation_3<GT, Tds> &tr)
 
   // write the vertices
 
-  for (Vertex_iterator it=tr.vertices_begin(); it!=tr.vertices_end(); ++it)
+  for (Vertex_iterator it = tr.vertices_begin(), end = tr.vertices_end();
+	 it != end; ++it)
     TV[i++] = it;
 
   CGAL_triangulation_assertion( i == n+1 );
@@ -1252,7 +1253,7 @@ operator<< (std::ostream& os, const Triangulation_3<GT, Tds> &tr)
   switch ( tr.dimension() ) {
   case 3:
     {
-      for(Cell_iterator it=tr.cells_begin(); it != tr.cells_end(); ++it) {
+      for(Cell_iterator it = tr.cells_begin(), end = tr.cells_end(); it != end; ++it) {
 	os << *it; // other information
         if(is_ascii(os))
           os << std::endl;
@@ -1261,7 +1262,7 @@ operator<< (std::ostream& os, const Triangulation_3<GT, Tds> &tr)
     }
   case 2:
     {
-      for(Facet_iterator it=tr.facets_begin(); it != tr.facets_end(); ++it) {
+      for(Facet_iterator it = tr.facets_begin(), end = tr.facets_end(); it != end; ++it) {
 	os << *((*it).first); // other information
         if(is_ascii(os))
           os << std::endl;
@@ -1270,7 +1271,7 @@ operator<< (std::ostream& os, const Triangulation_3<GT, Tds> &tr)
     }
   case 1:
     {
-      for(Edge_iterator it=tr.edges_begin(); it != tr.edges_end(); ++it) {
+      for(Edge_iterator it = tr.edges_begin(), end = tr.edges_end(); it != end; ++it) {
 	os << *((*it).first); // other information
         if(is_ascii(os))
           os << std::endl;
@@ -3041,8 +3042,8 @@ make_hole_3D( Vertex_handle v,
 
   incident_cells(v, std::back_inserter(hole));
 
-  for (typename std::vector<Cell_handle>::iterator cit = hole.begin();
-       cit != hole.end(); ++cit) {
+  for (typename std::vector<Cell_handle>::iterator cit = hole.begin(),
+       end = hole.end(); cit != end; ++cit) {
     int indv = (*cit)->index(v);
     Cell_handle opp_cit = (*cit)->neighbor( indv );
     Facet f(opp_cit, opp_cit->index(*cit));
@@ -3064,8 +3065,8 @@ remove_dim_down(Vertex_handle v, VertexRemover &remover)
     CGAL_triangulation_precondition (dimension() >= 0);
 
     // Collect all the hidden points.
-    for (All_cells_iterator ci = tds().raw_cells_begin();
-            ci != tds().raw_cells_end(); ++ci)
+    for (All_cells_iterator ci = tds().raw_cells_begin(),
+            end = tds().raw_cells_end(); ci != end; ++ci)
         remover.add_hidden_points(ci);
 
     tds().remove_decrease_dimension(v, infinite_vertex());
@@ -3176,9 +3177,8 @@ remove_3D(Vertex_handle v, VertexRemover &remover)
   // Also note that we use the vertices of *this, not of remover.tmp
 
   if(inf){
-    for(All_cells_iterator it = remover.tmp.all_cells_begin();
-	it != remover.tmp.all_cells_end();
-	++it){
+    for(All_cells_iterator it = remover.tmp.all_cells_begin(),
+	end = remover.tmp.all_cells_end(); it != end; ++it){
       for(i=0; i < 4; i++){
 	Facet f = std::pair<Cell_handle,int>(it,i);
 	Vertex_triple vt_aux = make_vertex_triple(f);
@@ -3188,9 +3188,8 @@ remove_3D(Vertex_handle v, VertexRemover &remover)
       }
     }
   } else {
-      for(Finite_cells_iterator it = remover.tmp.finite_cells_begin();
-	it != remover.tmp.finite_cells_end();
-	++it){
+      for(Finite_cells_iterator it = remover.tmp.finite_cells_begin(),
+	end = remover.tmp.finite_cells_end(); it != end; ++it){
       for(i=0; i < 4; i++){
 	Facet f = std::pair<Cell_handle,int>(it,i);
 	Vertex_triple vt_aux = make_vertex_triple(f);
@@ -3304,22 +3303,22 @@ is_valid(bool verbose, int level) const
   switch ( dimension() ) {
   case 3:
     {
-      Finite_cells_iterator it;
-      for ( it = finite_cells_begin(); it != finite_cells_end(); ++it )
+      for(Finite_cells_iterator it = finite_cells_begin(), end = finite_cells_end();
+	      it != end; ++it)
 	is_valid_finite(it, verbose, level);
       break;
     }
   case 2:
     {
-      Finite_facets_iterator it;
-      for ( it = finite_facets_begin(); it != finite_facets_end(); ++it )
+      for(Finite_facets_iterator it = finite_facets_begin(), end = finite_facets_end();
+	     it != end; ++it)
 	is_valid_finite(it->first,verbose,level);
       break;
     }
   case 1:
     {
-      Finite_edges_iterator it;
-      for ( it = finite_edges_begin(); it != finite_edges_end(); ++it )
+      for(Finite_edges_iterator it = finite_edges_begin(), end = finite_edges_end();
+	     it != end; ++it)
 	is_valid_finite(it->first,verbose,level);
       break;
     }

Triangulation_3/include/CGAL/Triangulation_hierarchy_3.h

@@ -220,14 +220,14 @@ Triangulation_hierarchy_3(const Triangulation_hierarchy_3<Tr> &tr)
 
   std::map< Vertex_handle, Vertex_handle > V;
 
-  for( Finite_vertices_iterator it=hierarchy[0]->finite_vertices_begin();
-       it != hierarchy[0]->finite_vertices_end(); ++it)
+  for( Finite_vertices_iterator it = hierarchy[0]->finite_vertices_begin(),
+       end = hierarchy[0]->finite_vertices_end(); it != end; ++it)
     if (it->up() != Vertex_handle())
       V[ it->up()->down() ] = it;
 
   for(int j=1; j<maxlevel; ++j) {
-    for( Finite_vertices_iterator it=hierarchy[j]->finite_vertices_begin();
-	 it != hierarchy[j]->finite_vertices_end(); ++it) {
+    for( Finite_vertices_iterator it = hierarchy[j]->finite_vertices_begin(),
+	 end = hierarchy[j]->finite_vertices_end(); it != end; ++it) {
 	// current it->down() pointer goes in original instead in copied triangulation
 	set_up_down(it, V[it->down()]);
 	// make map for next level
@@ -277,20 +277,20 @@ is_valid(bool verbose, int level) const
 	result = result && hierarchy[i]->is_valid(verbose, level);
 
   // verify that lower level has no down pointers
-  for( Finite_vertices_iterator it = hierarchy[0]->finite_vertices_begin();
-       it != hierarchy[0]->finite_vertices_end(); ++it)
+  for( Finite_vertices_iterator it = hierarchy[0]->finite_vertices_begin(),
+       end = hierarchy[0]->finite_vertices_end(); it != end; ++it)
     result = result && (it->down() == Vertex_handle());
 
   // verify that other levels has down pointer and reciprocal link is fine
   for(int j=1; j<maxlevel; ++j)
-    for( Finite_vertices_iterator it = hierarchy[j]->finite_vertices_begin();
-	 it != hierarchy[j]->finite_vertices_end(); ++it)
+    for( Finite_vertices_iterator it = hierarchy[j]->finite_vertices_begin(),
+	 end = hierarchy[j]->finite_vertices_end(); it != end; ++it)
       result = result && &*(it) == &*(it->down()->up());
 
   // verify that other levels has down pointer and reciprocal link is fine
   for(int k=0; k<maxlevel-1; ++k)
-    for( Finite_vertices_iterator it = hierarchy[k]->finite_vertices_begin();
-	 it != hierarchy[k]->finite_vertices_end(); ++it)
+    for( Finite_vertices_iterator it = hierarchy[k]->finite_vertices_begin(),
+	 end = hierarchy[k]->finite_vertices_end(); it != end; ++it)
       result = result && ( it->up() == Vertex_handle() ||
 	        &*it == &*(it->up())->down() );