manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Never write a 'using namespace" inside a .h file. Removed

This commit is contained in:
Paolo Cignoni 2010-07-23 06:09:52 +00:00
parent 59442fff3f
commit e081be0c6f
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
vcg/complex/trimesh/nring.h
View File

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