more fixes to radio menu items: fixed Check() for them; allow separators inside the...

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

diff --git a/src/common/hashmap.cpp b/src/common/hashmap.cpp
index 04cbd63111d81ad523d6d9b97532cfd64d141493..19a385d4511bbeefb7062a8472043757340ab59f 100644 (file)
--- a/src/common/hashmap.cpp
+++ b/src/common/hashmap.cpp
@@ -2,7 +2,7 @@
 // Name:        hashmap.cpp
 // Purpose:     wxHashMap implementation
 // Author:      Mattia Barbon
 // Name:        hashmap.cpp
 // Purpose:     wxHashMap implementation
 // Author:      Mattia Barbon

-// Modified by: 
+// Modified by:

 // Created:     29/01/2002
 // RCS-ID:      $Id$
 // Copyright:   (c) Mattia Barbon
 // Created:     29/01/2002
 // RCS-ID:      $Id$
 // Copyright:   (c) Mattia Barbon


@@ -22,8 +22,6 @@
 
 #include "wx/hashmap.h"
 
 
 #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) */
 /* FYI: This is the "One-at-a-Time" algorithm by Bob Jenkins */
 /* from requirements by Colin Plumb. */
 /* (http://burtleburtle.net/bob/hash/doobs.html) */


@@ -63,7 +61,7 @@ unsigned long wxStringHash::charStringHash( const char* k )
 #endif
 
 /* from SGI STL */
 #endif
 
 /* 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,
 {
     7ul,          13ul,         29ul,
     53ul,         97ul,         193ul,       389ul,       769ul,


@@ -76,7 +74,7 @@ const unsigned long _wxHashTableBase2::s_primes[prime_count] =
 
 unsigned long _wxHashTableBase2::GetNextPrime( unsigned long n )
 {
 
 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 )
     for( size_t i = 0; i < prime_count; ++i, ++ptr )
     {
         if( n < *ptr )


@@ -84,14 +82,15 @@ unsigned long _wxHashTableBase2::GetNextPrime( unsigned long n )
     }
 
     /* someone might try to alloc a 2^32-element hash table */
     }
 
     /* 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 )
 {
     /* 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 )
     {
 
     for( size_t i = 0; i < prime_count; ++i, --ptr )
     {