From 831a570d0b2de49987a463979a399a7fc4896842 Mon Sep 17 00:00:00 2001
From: nicopietroni <nico.pietroni@isti.cnr.it>
Date: Tue, 15 Jun 2004 16:15:18 +0000
Subject: [PATCH] modified some errors

---
 vcg/complex/trimesh/edge_collapse.h | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/vcg/complex/trimesh/edge_collapse.h b/vcg/complex/trimesh/edge_collapse.h
index 9be79bf4..2d1b541e 100644
--- a/vcg/complex/trimesh/edge_collapse.h
+++ b/vcg/complex/trimesh/edge_collapse.h
@@ -59,7 +59,7 @@ class EdgeCollapse
   ///the container of tetrahedron type
   typedef typename TriMeshType::FaceContainer FaceContainer;
   ///the container of vertex type
-  typedef typename TriMeshType::VertexContainer VertexContainer;
+  typedef typename TriMeshType::VertContainer VertContainer;
  
   /// Default Constructor
 	EdgeCollapse()
@@ -73,7 +73,7 @@ class EdgeCollapse
 
   struct Edge{
 			VertexType* v0,v1;
-      EdgeMark(	const VertexType*& a,const VertexType*& b){
+      Edge(	const VertexType*& a,const VertexType*& b){
 						assert(a!=b);
 						if(a<b) 
 							{v0=a;v1=b;}
@@ -81,11 +81,11 @@ class EdgeCollapse
 						{v1=a;v0=b;}
       }
 			
-			const bool operator <(const EdgeMark & e) const {
+			const bool operator <(const Edge & e) const {
 				return (v0==e.v0)?(v1<e.v1):(v0<e.v0);
 			}
 
-			const bool operator ==(const EdgeMark & e) const {
+			const bool operator ==(const Edge & e) const {
 			return (v0==e.v0)&&(v1==e.v1);
 			}
 
@@ -113,7 +113,7 @@ bool isMarked(Edge E,char M)
 }
 
 ///control link conditions for the collapse
-bool LinkCondition(Pos<FaceType> pos) 
+bool LinkCondition(vcg::face::Pos<FaceType> pos) 
 { 	
     const int LINK_V0 = VertexType::NewBitFlag();
 		const int LINK_V1 = VertexType::NewBitFlag();
@@ -230,3 +230,4 @@ bool LinkCondition(Pos<FaceType> pos)
 
 }
 }
+#endif 
\ No newline at end of file