1 files changed, 36 insertions, 46 deletions

diff --git a/src/hash.cpp b/src/hash.cpp
index d428dd6..004d6dd 100644
--- a/src/hash.cpp
+++ b/src/hash.cpp
@@ -2,48 +2,57 @@
 
 subExceptionDef( HashException )
 
-template<> uint32_t __calcHashCode<const int>( const int k )
+template<> uint32_t __calcHashCode<int>( const int &k )
 {
         return k;
 }
 
-template<> bool __cmpHashKeys<const int>( const int a, const int b )
+template<> bool __cmpHashKeys<int>( const int &a, const int &b )
 {
         return a == b;
 }
 
-template<> uint32_t __calcHashCode<int>( int k )
+template<> uint32_t __calcHashCode<unsigned int>( const unsigned int &k )
 {
         return k;
 }
 
-template<> bool __cmpHashKeys<int>( int a, int b )
+template<> bool __cmpHashKeys<unsigned int>( const unsigned int &a, const unsigned int &b )
 {
         return a == b;
 }
 
-template<> uint32_t __calcHashCode<const unsigned int>( const unsigned int k )
+template<>
+uint32_t __calcHashCode<const char *>( const char * const &k )
 {
-        return k;
-}
+        if (k == NULL)
+        {
+                return 0;
+        }
+        
+        unsigned long int nPos = 0;
+        for( const char *s = k; *s; s++ )
+        {
+                nPos = *s + (nPos << 6) + (nPos << 16) - nPos;
+        }
 
-template<> bool __cmpHashKeys<const unsigned int>( const unsigned int a, const unsigned int b )
-{
-        return a == b;
+        return nPos;
 }
 
-template<> uint32_t __calcHashCode<unsigned int>( unsigned int k )
+template<> bool __cmpHashKeys<const char *>( const char * const &a, const char * const &b )
 {
-        return k;
-}
+        if( a == b )
+                return true;
 
-template<> bool __cmpHashKeys<unsigned int>( unsigned int a, unsigned int b )
-{
-        return a == b;
+        for(int j=0; a[j] == b[j]; j++ )
+                if( *a == '\0' )
+                        return true;
+
+        return false;
 }
 
 template<>
-uint32_t __calcHashCode<const char *>( const char * k )
+uint32_t __calcHashCode<char *>( char * const &k )
 {
         if (k == NULL)
         {
@@ -59,30 +68,19 @@ uint32_t __calcHashCode<const char *>( const char * k )
         return nPos;
 }
 
-template<> bool __cmpHashKeys<const char *>( const char *a, const char *b )
+template<> bool __cmpHashKeys<char *>( char * const &a, char * const &b )
 {
         if( a == b )
                 return true;
 
-        for(; *a == *b; a++, b++ )
+        for(int j=0; a[j] == b[j]; j++ )
                 if( *a == '\0' )
                         return true;
 
         return false;
 }
 
-template<>
-uint32_t __calcHashCode<char *>( char *k )
-{
-        return __calcHashCode<const char *>((const char *)k );
-}
-
-template<> bool __cmpHashKeys<char *>( char *a, char *b )
-{
-        return __cmpHashKeys<const char *>((const char *)a, (const char *)b );
-}
-
-template<> uint32_t __calcHashCode<const std::string>( const std::string k )
+template<> uint32_t __calcHashCode<std::string>( const std::string &k )
 {
         std::string::size_type j, sz = k.size();
         const char *s = k.c_str();
@@ -96,28 +94,20 @@ template<> uint32_t __calcHashCode<const std::string>( const std::string k )
         return nPos;
 }
 
-template<> bool __cmpHashKeys<const std::string>( const std::string a, const std::string b )
+template<> bool __cmpHashKeys<std::string>( const std::string &a, const std::string &b )
 {
         return a == b;
 }
 
-template<> uint32_t __calcHashCode<std::string>( std::string k )
-{
-        return __calcHashCode<const std::string>( k );
-}
-
-template<> bool __cmpHashKeys<std::string>( std::string a, std::string b )
+template<> uint32_t __calcHashCode<Hashable>( const Hashable &k )
 {
-        return __cmpHashKeys<const std::string>( a, b );
+        return 0;
+        //return k.getHashCode();
 }
 
-template<> uint32_t __calcHashCode<Hashable &>( Hashable &k )
+template<> bool __cmpHashKeys<Hashable>( const Hashable &a, const Hashable &b )
 {
-        return k.getHashCode();
-}
-
-template<> bool __cmpHashKeys<Hashable &>( Hashable &a, Hashable &b )
-{
-        return a.compareForHash( b );
+        return false;
+        //return a.compareForHash( b );
 }