From 973c48fb766d1846afa08757340f00de67a9b7e1 Mon Sep 17 00:00:00 2001
From: ganovelli <fabio.ganovelli@isti.cnr.it>
Date: Tue, 17 May 2005 21:19:37 +0000
Subject: [PATCH] some std::and typename  missing  (CRS4)

---
 vcg/complex/edgemesh/base.h  |  7 +++++--
 vcg/complex/edgemesh/unify.h | 13 ++++++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/vcg/complex/edgemesh/base.h b/vcg/complex/edgemesh/base.h
index ff874dad..bd3eede6 100644
--- a/vcg/complex/edgemesh/base.h
+++ b/vcg/complex/edgemesh/base.h
@@ -24,6 +24,9 @@
   History
 
 $Log: not supported by cvs2svn $
+Revision 1.4  2004/10/28 00:47:42  cignoni
+Better Doxygen documentation
+
 Revision 1.3  2004/09/20 09:30:03  cignoni
 Better Doxygen docs
 
@@ -86,8 +89,8 @@ class EdgeMesh{
 	Box3<ScalarType> bbox;
 	
   /// Nomi di textures
-	//vector<string> textures;
-	//vector<string> normalmaps;
+	//std::vector<string> textures;
+	//std::vector<string> normalmaps;
 
 		/// La camera
 	//Camera<ScalarType> camera;
diff --git a/vcg/complex/edgemesh/unify.h b/vcg/complex/edgemesh/unify.h
index 19567c1d..941eb9aa 100644
--- a/vcg/complex/edgemesh/unify.h
+++ b/vcg/complex/edgemesh/unify.h
@@ -24,6 +24,9 @@
   History
 
 $Log: not supported by cvs2svn $
+Revision 1.2  2005/03/08 14:42:22  ganovelli
+added vcg header
+
 
 ****************************************************************************/
 
@@ -33,7 +36,7 @@ $Log: not supported by cvs2svn $
 #include <vcg/space/index/grid_static_ptr.h>
 #include <vcg/space/box3.h>
 #include <vcg/complex/edgemesh/update/bounding.h>
-#include <vector>
+#include <std::vector>
 
 namespace vcg
 	{
@@ -74,7 +77,7 @@ namespace vcg
 					return v->IsD();
 				}
 			};
-			typedef typename GridStaticPtr<	std::vector<PVertex> > GridType;
+			typedef typename GridStaticPtr<	std::std::vector<PVertex> > GridType;
 
 			static void Join(PVertex pv0,PVertex & pv1){
 				pv1.e->V(pv1.z) = pv0.v;
@@ -84,19 +87,19 @@ namespace vcg
 			static GridType & Grid(){static GridType grid; return grid; }
 
 			static void Vertices(EdgeMeshType & em,   ScalarType   epsilon){
-				EdgeMeshType::EdgeIterator ei;
+				typename EdgeMeshType::EdgeIterator ei;
 				bool lastRound ;
 				if(em.vn){
 					vcg::edge::UpdateBounding<EdgeMeshType>::Box(em);
 					Grid().SetBBox(em.bbox);
 
-					vector<PVertex> pv;
+					std::vector<PVertex> pv;
 					for(ei = em.edges.begin(); ei != em.edges.end();++ei){
 						pv.push_back(PVertex(&*ei,0));
 						pv.push_back(PVertex(&*ei,1));
 					}					
 					Grid().Set(pv);
-					vector<PVertex>::iterator pvi;
+					typename std::vector<PVertex>::iterator pvi;
 					Point3<ScalarType> p;
 					PVertex * closest;
 					do{