manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix name of hash functor to avoid conflict with the 3D spatial hash

This commit is contained in:
Massimiliano Corsini 2014-02-11 13:48:52 +00:00
parent 9e28c7b1e1
commit 171510a59b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vcg/space/index/index2D/spatial_hashing_2D.h
View File

@ -55,7 +55,7 @@ namespace vcg{
// hashing function // hashing function
struct HashFunctor : public std::unary_function<Point2i, size_t> struct HashFunctor2D : public std::unary_function<Point2i, size_t>
{ {
enum enum
{ // parameters for hash table { // parameters for hash table
@ -101,7 +101,7 @@ namespace vcg{
// the hash index directly the grid structure. // 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. // We use a MultiMap because we need to store many object (faces) inside each cell of the grid.
typedef typename STDEXT::hash_multimap<Point2i, ObjType *, HashFunctor> HashType; typedef typename STDEXT::hash_multimap<Point2i, ObjType *, HashFunctor2D> HashType;
typedef typename HashType::iterator HashIterator; typedef typename HashType::iterator HashIterator;
HashType hash_table; // The real HASH TABLE ************************************** HashType hash_table; // The real HASH TABLE **************************************