From 571ea185b41115ec14f19c827d8b1c946515c8c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Sat, 9 Mar 2013 09:49:03 +0100 Subject: [PATCH] fix compilation error and warnings --- Surface_modeling/include/CGAL/Deform_mesh.h | 4 ++-- .../CGAL/internal/Surface_modeling/Spokes_and_rims_iterator.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Surface_modeling/include/CGAL/Deform_mesh.h b/Surface_modeling/include/CGAL/Deform_mesh.h index 61bdd686c33..ef74f4eace2 100644 --- a/Surface_modeling/include/CGAL/Deform_mesh.h +++ b/Surface_modeling/include/CGAL/Deform_mesh.h @@ -318,7 +318,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); @@ -482,7 +482,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!"); double energy_this = 0; double energy_last; 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