diff --git a/vcg/complex/trimesh/nring.h b/vcg/complex/trimesh/nring.h index 73b0743b..4b5b857f 100644 --- a/vcg/complex/trimesh/nring.h +++ b/vcg/complex/trimesh/nring.h @@ -28,9 +28,6 @@ #include #include #include -#include - -using namespace std; namespace vcg { @@ -56,11 +53,11 @@ public: typedef typename MeshType::CoordType CoordType; - vector allV; - vector allF; + std::vector allV; + std::vector allF; - vector lastV; - vector lastF; + std::vector lastV; + std::vector lastF; MeshType* m; @@ -80,11 +77,11 @@ public: { insertAndFlag(v); - typename vcg::face::Pos p(v->VFp(),v); + typename face::Pos p(v->VFp(),v); assert(p.V() == v); int count = 0; - vcg::face::Pos ori = p; + face::Pos ori = p; do { insertAndFlag(p.F()); @@ -121,8 +118,8 @@ public: static void clearFlags(MeshType* m) { - vcg::tri::UpdateFlags::VertexClearV(*m); - vcg::tri::UpdateFlags::FaceClearV(*m); + tri::UpdateFlags::VertexClearV(*m); + tri::UpdateFlags::FaceClearV(*m); } void clear() @@ -138,12 +135,12 @@ public: void expand() { - vector lastVtemp = lastV; + std::vector lastVtemp = lastV; lastV.clear(); lastF.clear(); - for(typename vector::iterator it = lastVtemp.begin(); it != lastVtemp.end(); ++it) + for(typename std::vector::iterator it = lastVtemp.begin(); it != lastVtemp.end(); ++it) { insertAndFlag1Ring(*it); }