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

fix compilation error and warnings

This commit is contained in:
Sébastien Loriot 2013-03-09 09:49:03 +01:00
parent 4ccc5b8690
commit 571ea185b4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Surface_modeling/include/CGAL/Deform_mesh.h
View File

@ -318,7 +318,7 @@ public:
void erase_roi(vertex_descriptor vd) void erase_roi(vertex_descriptor vd)
{ {
need_preprocess = true; need_preprocess = true;
std::vector<vertex_descriptor>::iterator it = std::find(ros.begin(), ros.end(), vd); typename std::vector<vertex_descriptor>::iterator it = std::find(ros.begin(), ros.end(), vd);
if(vd != ros.end()) if(vd != ros.end())
{ {
ros.erase(it); ros.erase(it);
@ -482,7 +482,7 @@ public:
*/ */
void deform(unsigned int iterations, double tolerance) 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_this = 0;
double energy_last; double energy_last;

2
Surface_modeling/include/CGAL/internal/Surface_modeling/Spokes_and_rims_iterator.h
View File

@ -25,7 +25,7 @@ public:
typedef typename boost::graph_traits<Polyhedron>::edge_descriptor edge_descriptor; typedef typename boost::graph_traits<Polyhedron>::edge_descriptor edge_descriptor;
Spokes_and_rims_iterator(out_edge_iterator edge_iterator, Polyhedron& polyhedron) 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 /// descriptor will be assigned to next valid edge, note that iterator might not change