diff --git a/vcg/complex/edgemesh/unify.h b/vcg/complex/edgemesh/unify.h
index 084c5299..88b0c16e 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.8  2005/10/03 16:16:54  spinelli
+used new version of grid query
+
 Revision 1.7  2005/09/19 13:10:12  spinelli
 fixed bugs
 
@@ -106,7 +109,7 @@ namespace vcg
 					return v->IsD();
 				}
 			};
-			typedef typename GridStaticPtr<	PVertex > GridType;
+			typedef GridStaticPtr<	PVertex > GridType;
 
 			static void Join(PVertex pv0,PVertex & pv1){
 				pv1.e->V(pv1.z) = pv0.v;
@@ -185,4 +188,4 @@ namespace vcg
 
 	} // end namespace
 
-#endif
\ No newline at end of file
+#endif
diff --git a/vcg/complex/vertexmesh/closest.h b/vcg/complex/vertexmesh/closest.h
index 501b9640..d03f26cb 100644
--- a/vcg/complex/vertexmesh/closest.h
+++ b/vcg/complex/vertexmesh/closest.h
@@ -77,15 +77,15 @@ namespace vcg {
 			typename MESH::VertexType * GetClosestVertex( MESH & mesh,GRID & gr,const typename GRID::CoordType & _p, 
 			const typename GRID::ScalarType & _maxDist,typename GRID::ScalarType & _minDist )
 		{
-			typedef GRID::ScalarType ScalarType;
+			typedef typename GRID::ScalarType ScalarType;
 			typedef Point3<ScalarType> Point3x;
 			typedef VertTmark<MESH> MarkerVert;
 			MarkerVert mv;
 			mv.SetMesh(&mesh);
-			typedef vcg::vertex::PointDistanceFunctor VDistFunct;
+			typedef  PointDistanceFunctor VDistFunct;
 			_minDist=_maxDist;
 			Point3x _closestPt;
-			return (gr.GetClosest<VDistFunct,MarkerVert>(VDistFunct(),mv,_p,_maxDist,_minDist,_closestPt));
+			return (gr.GetClosest(PointDistanceFunctor(),mv,_p,_maxDist,_minDist,_closestPt));
 		}
 
 		
@@ -98,7 +98,7 @@ namespace vcg {
 			MarkerVert mv;
 			mv.SetMesh(&mesh);
 			typedef vcg::vertex::PointDistanceFunctor VDistFunct;
-			return (gr.GetKClosest<VDistFunct,MarkerVert,OBJPTRCONTAINER,DISTCONTAINER,POINTCONTAINER>
+			return (gr.GetKClosest/*<VDistFunct,MarkerVert,OBJPTRCONTAINER,DISTCONTAINER,POINTCONTAINER>*/
 				(VDistFunct(),mv,_k,_p,_maxDist,_objectPtrs,_distances,_points));
 		}
 
@@ -115,7 +115,7 @@ namespace vcg {
 			MarkerVert mv;
 			mv.SetMesh(&mesh);
 			typedef vcg::vertex::PointDistanceFunctor VDistFunct;
-			return (gr.GetInSphere<VDistFunct,MarkerVert,OBJPTRCONTAINER,DISTCONTAINER,POINTCONTAINER>
+			return (gr.GetInSphere/*<VDistFunct,MarkerVert,OBJPTRCONTAINER,DISTCONTAINER,POINTCONTAINER>*/
 				(VDistFunct(),mv,_p,_r,_objectPtrs,_distances,_points));
 		}
 
@@ -129,21 +129,21 @@ namespace vcg {
 			typedef VertTmark<MESH> MarkerVert;
 			MarkerVert mv;
 			mv.SetMesh(&mesh);
-			return(gr.GetInBox<MarkerVert,OBJPTRCONTAINER>(mv,_bbox,_objectPtrs));
+			return(gr.GetInBox(mv,_bbox,_objectPtrs));
 		}
 
 
 		//**ITERATORS DEFINITION**//
 
 		template <class GRID,class MESH>
-		class ClosestVertexIterator:public vcg::ClosestIterator<GRID,vcg::vertex::PointDistanceFunctor,typename VertTmark<MESH> >
+		class ClosestVertexIterator:public vcg::ClosestIterator<GRID,vcg::vertex::PointDistanceFunctor, VertTmark<MESH> >
 		{
 		public:
-			typedef typename GRID GridType;
-			typedef typename MESH MeshType;
-			typedef typename VertTmark<MESH> MarkerVert;
-			typedef typename vcg::vertex::PointDistanceFunctor VDistFunct;
-			typedef typename vcg::ClosestIterator<GRID,VDistFunct,typename VertTmark<MESH> > ClosestBaseType;
+			typedef GRID GridType;
+			typedef MESH MeshType;
+			typedef VertTmark<MESH> MarkerVert;
+			typedef vcg::vertex::PointDistanceFunctor VDistFunct;
+			typedef vcg::ClosestIterator<GRID,VDistFunct, VertTmark<MESH> > ClosestBaseType;
 
 			ClosestVertexIterator(GridType &_Si):ClosestBaseType(_Si,VDistFunct()){}