From 5b4b14ca0e206b0f2064e416c46f1dba331e912c Mon Sep 17 00:00:00 2001
From: ganovelli <fabio.ganovelli@isti.cnr.it>
Date: Wed, 2 Jun 2004 16:28:22 +0000
Subject: [PATCH] minor changes (swap =>> math::Swap)

---
 vcg/complex/trimesh/update/topology.h | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/vcg/complex/trimesh/update/topology.h b/vcg/complex/trimesh/update/topology.h
index d9c80c14..3d7d3389 100644
--- a/vcg/complex/trimesh/update/topology.h
+++ b/vcg/complex/trimesh/update/topology.h
@@ -24,6 +24,9 @@
   History
 
 $Log: not supported by cvs2svn $
+Revision 1.6  2004/05/10 15:23:43  cignoni
+Changed a FV -> VF in VertexFace topology computation
+
 Revision 1.5  2004/05/06 15:24:38  pietroni
 changed names to topology functions
 
@@ -86,7 +89,7 @@ void Set( FacePointer  pf, const int nz )
 	v[1] = pf->V((nz+1)%3);
 	assert(v[0] != v[1]);
 
-	if( v[0] > v[1] ) swap(v[0],v[1]);
+	if( v[0] > v[1] ) math::Swap(v[0],v[1]);
 	f    = pf;
 	z    = nz;
 }
@@ -136,9 +139,9 @@ static void FaceFace(MeshType &m)
 {
   if(!m.HasFFTopology()) return;		
 
-  vector<PEdge> e;
+  std::vector<PEdge> e;
 	FaceIterator pf;
-	vector<PEdge>::iterator p;
+	std::vector<PEdge>::iterator p;
 
 	if( m.fn == 0 ) return;
 
@@ -156,12 +159,12 @@ static void FaceFace(MeshType &m)
 
 	int ne = 0;											// Numero di edge reali
 
-	vector<PEdge>::iterator pe,ps;
+	std::vector<PEdge>::iterator pe,ps;
 	for(ps = e.begin(),pe=e.begin();pe<=e.end();++pe)	// Scansione vettore ausiliario
 	{
 		if( pe==e.end() || *pe != *ps )					// Trovo blocco di edge uguali
 		{
-			vector<PEdge>::iterator q,q_next;
+			std::vector<PEdge>::iterator q,q_next;
 			for (q=ps;q<pe-1;++q)						// Scansione facce associate
 			{
 				assert((*q).z>=0);