diff --git a/Surface_modeling/include/CGAL/Deform_mesh.h b/Surface_modeling/include/CGAL/Deform_mesh.h index c7f6a243b8e..54664db2b07 100644 --- a/Surface_modeling/include/CGAL/Deform_mesh.h +++ b/Surface_modeling/include/CGAL/Deform_mesh.h @@ -321,7 +321,7 @@ public: void erase_roi(vertex_descriptor vd) { need_preprocess = true; - std::vector::iterator it = std::find(ros.begin(), ros.end(), vd); + typename std::vector::iterator it = std::find(ros.begin(), ros.end(), vd); if(vd != ros.end()) { ros.erase(it); @@ -463,7 +463,7 @@ public: */ void deform(unsigned int iterations, double tolerance) { - CGAL_precondition(!need_preprocess, "preprocess() need to be called before deforming!"); + CGAL_precondition(!need_preprocess || !"preprocess() need to be called before deforming!"); // Note: no energy based termination occurs at first iteration // because comparing energy of original model (before deformation) and deformed model (deformed_1_iteration) diff --git a/Surface_modeling/include/CGAL/internal/Surface_modeling/Spokes_and_rims_iterator.h b/Surface_modeling/include/CGAL/internal/Surface_modeling/Spokes_and_rims_iterator.h index dc89cf99a30..bc728d93e58 100644 --- a/Surface_modeling/include/CGAL/internal/Surface_modeling/Spokes_and_rims_iterator.h +++ b/Surface_modeling/include/CGAL/internal/Surface_modeling/Spokes_and_rims_iterator.h @@ -25,7 +25,7 @@ public: typedef typename boost::graph_traits::edge_descriptor edge_descriptor; Spokes_and_rims_iterator(out_edge_iterator edge_iterator, Polyhedron& polyhedron) - : iterator(edge_iterator), descriptor(*edge_iterator), polyhedron(polyhedron), is_current_rim(false) + : is_current_rim(false), iterator(edge_iterator), descriptor(*edge_iterator), polyhedron(polyhedron) { } /// descriptor will be assigned to next valid edge, note that iterator might not change