From 171510a59b3df3dddb7b53ac3292c990769429a6 Mon Sep 17 00:00:00 2001 From: maxcorsini Date: Tue, 11 Feb 2014 13:48:52 +0000 Subject: [PATCH] fix name of hash functor to avoid conflict with the 3D spatial hash --- vcg/space/index/index2D/spatial_hashing_2D.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vcg/space/index/index2D/spatial_hashing_2D.h b/vcg/space/index/index2D/spatial_hashing_2D.h index ee82b453..44e27376 100644 --- a/vcg/space/index/index2D/spatial_hashing_2D.h +++ b/vcg/space/index/index2D/spatial_hashing_2D.h @@ -55,7 +55,7 @@ namespace vcg{ // hashing function - struct HashFunctor : public std::unary_function + struct HashFunctor2D : public std::unary_function { enum { // parameters for hash table @@ -101,7 +101,7 @@ namespace vcg{ // the hash index directly the grid structure. // We use a MultiMap because we need to store many object (faces) inside each cell of the grid. - typedef typename STDEXT::hash_multimap HashType; + typedef typename STDEXT::hash_multimap HashType; typedef typename HashType::iterator HashIterator; HashType hash_table; // The real HASH TABLE **************************************