X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e05c8fa7bb8aa3a2d8d61dce57500ddbd317156f..ee146bca1b2d76b3e486c66a2d5ad15e44f2cbd0:/src/common/hashmap.cpp

diff --git a/src/common/hashmap.cpp b/src/common/hashmap.cpp
index 04cbd63111..d5b3229b74 100644
--- a/src/common/hashmap.cpp
+++ b/src/common/hashmap.cpp
@@ -2,17 +2,13 @@
 // Name:        hashmap.cpp
 // Purpose:     wxHashMap implementation
 // Author:      Mattia Barbon
-// Modified by: 
+// Modified by:
 // Created:     29/01/2002
 // RCS-ID:      $Id$
 // Copyright:   (c) Mattia Barbon
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "hashmap.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -22,8 +18,6 @@
 
 #include "wx/hashmap.h"
 
-#include <assert.h>
-
 /* FYI: This is the "One-at-a-Time" algorithm by Bob Jenkins */
 /* from requirements by Colin Plumb. */
 /* (http://burtleburtle.net/bob/hash/doobs.html) */
@@ -62,8 +56,10 @@ unsigned long wxStringHash::charStringHash( const char* k )
 }
 #endif
 
+#if !wxUSE_STL || !defined(HAVE_STL_HASH_MAP)
+
 /* from SGI STL */
-const unsigned long _wxHashTableBase2::s_primes[prime_count] =
+const unsigned long _wxHashTableBase2::ms_primes[prime_count] =
 {
     7ul,          13ul,         29ul,
     53ul,         97ul,         193ul,       389ul,       769ul,
@@ -76,7 +72,7 @@ const unsigned long _wxHashTableBase2::s_primes[prime_count] =
 
 unsigned long _wxHashTableBase2::GetNextPrime( unsigned long n )
 {
-    const unsigned long* ptr = &s_primes[0];
+    const unsigned long* ptr = &ms_primes[0];
     for( size_t i = 0; i < prime_count; ++i, ++ptr )
     {
         if( n < *ptr )
@@ -84,14 +80,15 @@ unsigned long _wxHashTableBase2::GetNextPrime( unsigned long n )
     }
 
     /* someone might try to alloc a 2^32-element hash table */
-    assert(0);
+    wxFAIL_MSG( _T("hash table too big?") );
+
     /* quiet warning */
     return 0;
 }
 
 unsigned long _wxHashTableBase2::GetPreviousPrime( unsigned long n )
 {
-    const unsigned long* ptr = &s_primes[prime_count - 1];
+    const unsigned long* ptr = &ms_primes[prime_count - 1];
 
     for( size_t i = 0; i < prime_count; ++i, --ptr )
     {
@@ -152,3 +149,4 @@ _wxHashTable_NodeBase* _wxHashTableBase2::DummyProcessNode(_wxHashTable_NodeBase
     return node;
 }
 
+#endif // !wxUSE_STL || !defined(HAVE_STL_HASH_MAP)