From 360da1dd586376d811384044a443d165fa13f7ac Mon Sep 17 00:00:00 2001 From: cignoni Date: Thu, 13 Nov 2008 09:44:46 +0000 Subject: [PATCH] small changes (this-> disambiguations) and a type hack to grant compilation on mac gcc --- vcg/complex/trimesh/base.h | 5 ++--- vcg/simplex/edgeplus/component.h | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/vcg/complex/trimesh/base.h b/vcg/complex/trimesh/base.h index 4e5924bb..7ac3dfcd 100644 --- a/vcg/complex/trimesh/base.h +++ b/vcg/complex/trimesh/base.h @@ -159,11 +159,10 @@ namespace tri { @param VertContainerType (Template Parameter) Specifies the type of the vertices container any the vertex type. @param FaceContainerType (Template Parameter) Specifies the type of the faces container any the face type. */ - + class DummyEdge; template < class VertContainerType, class FaceContainerType, - class EdgeContainerType = std::vector > - > + class EdgeContainerType = std::vector< vcg::EdgeSimp2 > > class TriMesh{ public: typedef TriMesh MeshType; diff --git a/vcg/simplex/edgeplus/component.h b/vcg/simplex/edgeplus/component.h index bca327db..b75143ba 100644 --- a/vcg/simplex/edgeplus/component.h +++ b/vcg/simplex/edgeplus/component.h @@ -272,7 +272,7 @@ public: typename T::VertexPointer & HEVp() {return _vp ; } const typename T::VertexPointer cHEVp() const {return _vp ; } template < class LeftV> - void ImportLocal(const LeftV & left ) { V() = NULL; T::ImportLocal( left); } + void ImportLocal(const LeftV & left ) { this->V() = NULL; T::ImportLocal( left); } static bool HasHEVAdjacency() { return true; } static bool HasHEVAdjacencyOcc() { return true; } static void Name(std::vector & name){name.push_back(std::string("HEVAdj"));T::Name(name);} @@ -363,7 +363,7 @@ public: typename T::EdgePointer &HENp() {return _nep; } typename T::EdgePointer cHENp() {return _nep; } template < class LeftV> - void ImportLocal(const LeftV & left ) { EEp() = NULL; T::ImportLocal( left); } + void ImportLocal(const LeftV & left ) { this->EEp() = NULL; T::ImportLocal( left); } static bool HasHENextAdjacency() { return true; } static void Name(std::vector & name){name.push_back(std::string("HENextAdj"));T::Name(name);} @@ -390,7 +390,7 @@ public: typename T::EdgePointer &HEOp() {return _oep; } typename T::EdgePointer cHEOp() {return _oep; } template < class LeftV> - void ImportLocal(const LeftV & left ) { EEp() = NULL; T::ImportLocal( left); } + void ImportLocal(const LeftV & left ) { this->EEp() = NULL; T::ImportLocal( left); } static bool HasHEOppAdjacency() { return true; } static void Name(std::vector & name){name.push_back(std::string("HEOpptAdj"));T::Name(name);} @@ -416,9 +416,9 @@ public: HEPrevAdj(){_pep=0;} typename T::EdgePointer &HEPp() {return _pep; } typename T::EdgePointer cHEPp() {return _pep; } - int &EEi(const int & i) {return _nei[i]; } + int &EEi(const int & i) {return this->_nei[i]; } template < class LeftV> - void ImportLocal(const LeftV & left ) { EEp() = NULL; T::ImportLocal( left); } + void ImportLocal(const LeftV & left ) { this->EEp() = NULL; T::ImportLocal( left); } static bool HasHEPrevAdjacency() { return true; } static void Name(std::vector & name){name.push_back(std::string("HEPrevAdj"));T::Name(name);} @@ -446,7 +446,7 @@ public: typename T::FacePointer cEFp() {return _fp; } int &EFi() {return _zp; } template < class LeftV> - void ImportLocal(const LeftV & left ) { EFp() = NULL; T::ImportLocal( left); } + void ImportLocal(const LeftV & left ) { this->EFp() = NULL; T::ImportLocal( left); } static bool HasEFAdjacency() { return true; } static bool HasEFAdjacencyOcc() { return true; } static void Name(std::vector & name){name.push_back(std::string("EFAdj"));T::Name(name);} @@ -469,12 +469,12 @@ class HEdgeData : public EFAdj< // pointer to the face T > > > >{ // functions to make the half edge user confortable - typename T::VertexPointer & Vertex() { return HEVp();} - const typename T::VertexPointer & cVertex() const { return cHEVp();} - typename T::EdgePointer Opposite() { return &HEOp();} - const typename T::EdgePointer & cOpposite() const { return cHEOp();} - typename T::EdgePointer & Next() { return HENp();} - const typename T::EdgePointer & Next() const { return HENp();} + typename T::VertexPointer & Vertex() { return this->HEVp();} + const typename T::VertexPointer & cVertex() const { return this->cHEVp();} + typename T::EdgePointer Opposite() { return &this->HEOp();} + const typename T::EdgePointer & cOpposite() const { return this->cHEOp();} + typename T::EdgePointer & Next() { return this->HENp();} + const typename T::EdgePointer & Next() const { return this->HENp();} };