From dd97666bbe0471bd468d168e26355c8d757f4cdd Mon Sep 17 00:00:00 2001 From: Paolo Cignoni cignoni Date: Sun, 18 Sep 2011 15:29:31 +0000 Subject: [PATCH] corrected a few c++ error detected by clang --- .../filter_isoparametrization/iso_parametrization.h | 2 +- src/meshlabplugins/filter_isoparametrization/opt_patch.h | 5 +++-- src/meshlabplugins/filter_isoparametrization/param_mesh.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/meshlabplugins/filter_isoparametrization/iso_parametrization.h b/src/meshlabplugins/filter_isoparametrization/iso_parametrization.h index 2ca09ef8e..a64e152e5 100644 --- a/src/meshlabplugins/filter_isoparametrization/iso_parametrization.h +++ b/src/meshlabplugins/filter_isoparametrization/iso_parametrization.h @@ -90,7 +90,7 @@ public: } CoordType RPos; - static const bool Has_Auxiliary(){return false;} + static bool Has_Auxiliary(){return false;} }; class ParamFace: public vcg::Face < ParamUsedTypes, diff --git a/src/meshlabplugins/filter_isoparametrization/opt_patch.h b/src/meshlabplugins/filter_isoparametrization/opt_patch.h index b0147cef0..8d47ce8fc 100644 --- a/src/meshlabplugins/filter_isoparametrization/opt_patch.h +++ b/src/meshlabplugins/filter_isoparametrization/opt_patch.h @@ -364,7 +364,7 @@ public: delete(p); } - typedef struct Elem + struct Elem { public: VertexType *center; @@ -372,7 +372,7 @@ public: int t_mark; //bool operator <(Elem* e){return (priorityPriority() < h.locModPtr->Priority()); @@ -385,6 +385,7 @@ public: t_mark=_t_mark; } }; + std::vector Operations; diff --git a/src/meshlabplugins/filter_isoparametrization/param_mesh.h b/src/meshlabplugins/filter_isoparametrization/param_mesh.h index 9dca773f5..cfa3aace1 100644 --- a/src/meshlabplugins/filter_isoparametrization/param_mesh.h +++ b/src/meshlabplugins/filter_isoparametrization/param_mesh.h @@ -41,7 +41,7 @@ public: //num_collapse=1; } - static const bool Has_Auxiliary(){return true;} + static bool Has_Auxiliary(){return true;} vcg::Point2 RestUV;