From ad69d7d893808a012576818b9ed8e03a8828b17d Mon Sep 17 00:00:00 2001
From: nicopietroni <nico.pietroni@isti.cnr.it>
Date: Fri, 8 Aug 2014 21:32:50 +0000
Subject: [PATCH] chenged GridDoRay to GridDoRay2D.. corrected one bug in the
 initial #define

---
 vcg/space/index/index2D/grid_closest_2D.h    | 6 +++---
 vcg/space/index/index2D/grid_static_ptr_2D.h | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/vcg/space/index/index2D/grid_closest_2D.h b/vcg/space/index/index2D/grid_closest_2D.h
index afdfb7ed..f04fa75d 100644
--- a/vcg/space/index/index2D/grid_closest_2D.h
+++ b/vcg/space/index/index2D/grid_closest_2D.h
@@ -21,8 +21,8 @@
 *                                                                           *
 ****************************************************************************/
 
-#ifndef __VCGLIB_GRID_CLOSEST
-#define __VCGLIB_GRID_CLOSEST
+#ifndef __VCGLIB_GRID_CLOSEST_2D
+#define __VCGLIB_GRID_CLOSEST_2D
 
 #include <vcg/space/index/index2D/space_iterators_2D.h>
 #include <vcg/space/intersection2.h>
@@ -175,7 +175,7 @@ typename SPATIAL_INDEX::ObjPtr  GridClosest2D(SPATIAL_INDEX &Si,
 }
 
 template <class SPATIALINDEXING,class OBJRAYISECTFUNCTOR, class OBJMARKER>
-typename SPATIALINDEXING::ObjPtr GridDoRay(SPATIALINDEXING &_Si,
+typename SPATIALINDEXING::ObjPtr GridDoRay2D(SPATIALINDEXING &_Si,
                                            OBJRAYISECTFUNCTOR &_rayIntersector,
                                            OBJMARKER &_marker,
                                            const Ray2<typename SPATIALINDEXING::ScalarType> & _ray,
diff --git a/vcg/space/index/index2D/grid_static_ptr_2D.h b/vcg/space/index/index2D/grid_static_ptr_2D.h
index 9519f78f..f51a151b 100644
--- a/vcg/space/index/index2D/grid_static_ptr_2D.h
+++ b/vcg/space/index/index2D/grid_static_ptr_2D.h
@@ -171,7 +171,7 @@ public:
                  const Ray2<ScalarType> & _ray, const ScalarType & _maxDist,
                  ScalarType & _t)
     {
-        return(vcg::GridDoRay<MyGridType,OBJRAYISECTFUNCTOR,OBJMARKER>(*this,_rayIntersector,_marker,_ray,_maxDist,_t));
+        return(vcg::GridDoRay2D<MyGridType,OBJRAYISECTFUNCTOR,OBJMARKER>(*this,_rayIntersector,_marker,_ray,_maxDist,_t));
     }