Sun CC doesn't allow calling static function from template instantiations so rename...

[wxWidgets.git] / src / common / hashmap.cpp

diff --git a/src/common/hashmap.cpp b/src/common/hashmap.cpp
index 19a385d4511bbeefb7062a8472043757340ab59f..de00f58cab7b72eb7cb5ac1bf662b144f0a56b32 100644 (file)
--- a/src/common/hashmap.cpp
+++ b/src/common/hashmap.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        hashmap.cpp
+// Name:        src/common/hashmap.cpp
 // Purpose:     wxHashMap implementation
 // Author:      Mattia Barbon
 // Modified by:
@@ -9,15 +9,11 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "hashmap.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #include "wx/hashmap.h"
@@ -26,7 +22,8 @@
 /* from requirements by Colin Plumb. */
 /* (http://burtleburtle.net/bob/hash/doobs.html) */
 /* adapted from Perl sources ( hv.h ) */
-unsigned long wxStringHash::wxCharStringHash( const wxChar* k )
+template<typename T>
+static unsigned long DoStringHash(T *k)
 {
     unsigned long hash = 0;
 
@@ -42,23 +39,14 @@ unsigned long wxStringHash::wxCharStringHash( const wxChar* k )
     return hash + (hash << 15);
 }
 
-#if wxUSE_UNICODE
-unsigned long wxStringHash::charStringHash( const char* k )
-{
-    unsigned long hash = 0;
+unsigned long wxStringHash::stringHash( const char* k )
+  { return DoStringHash(k); }
 
-    while( *k )
-    {
-        hash += *k++;
-        hash += (hash << 10);
-        hash ^= (hash >> 6);
-    }
-    hash += (hash << 3);
-    hash ^= (hash >> 11);
+unsigned long wxStringHash::stringHash( const wchar_t* k )
+  { return DoStringHash(k); }
 
-    return hash + (hash << 15);
-}
-#endif
+
+#if !wxUSE_STL || !defined(HAVE_STL_HASH_MAP)
 
 /* from SGI STL */
 const unsigned long _wxHashTableBase2::ms_primes[prime_count] =
@@ -151,3 +139,4 @@ _wxHashTable_NodeBase* _wxHashTableBase2::DummyProcessNode(_wxHashTable_NodeBase
     return node;
 }
 
+#endif // !wxUSE_STL || !defined(HAVE_STL_HASH_MAP)