disable dialup manager for MGL, it doesn't link as there is no DOS implementation...

[wxWidgets.git] / include / wx / hashmap.h

diff --git a/include/wx/hashmap.h b/include/wx/hashmap.h
index 14f6199016cd0a47359a7f0db979b41eb8b3b8a9..41aaccb230facd6b1fa590b9ddf15adf7ba72dab 100644 (file)
--- a/include/wx/hashmap.h
+++ b/include/wx/hashmap.h
@@ -1,8 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        hashmap.cpp
+// Name:        wx/hashmap.h

 // Purpose:     wxHashMap class
 // Author:      Mattia Barbon
 // Purpose:     wxHashMap class
 // 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


@@ -12,26 +12,57 @@
 #ifndef _WX_HASHMAP_H_
 #define _WX_HASHMAP_H_
 
 #ifndef _WX_HASHMAP_H_
 #define _WX_HASHMAP_H_
 

-#ifdef __GNUG__
-#pragma interface "hashmap.h"
+#include "wx/string.h"
+
+#if (defined(HAVE_EXT_HASH_MAP) || defined(HAVE_HASH_MAP)) \
+    && (defined(HAVE_GNU_CXX_HASH_MAP) || defined(HAVE_STD_HASH_MAP))
+    #define HAVE_STL_HASH_MAP
+#endif
+
+#if wxUSE_STL && defined(HAVE_STL_HASH_MAP)
+
+#if defined(HAVE_EXT_HASH_MAP)
+    #include <ext/hash_map>
+#elif defined(HAVE_HASH_MAP)
+    #include <hash_map>
+#endif
+
+#if defined(HAVE_GNU_CXX_HASH_MAP)
+    #define WX_HASH_MAP_NAMESPACE __gnu_cxx
+#elif defined(HAVE_STD_HASH_MAP)
+    #define WX_HASH_MAP_NAMESPACE std

 #endif
 
 #endif
 

-#include <wx/string.h>
+#define _WX_DECLARE_HASH_MAP( KEY_T, VALUE_T, HASH_T, KEY_EQ_T, CLASSNAME, CLASSEXP ) \
+    typedef WX_HASH_MAP_NAMESPACE::hash_map< KEY_T, VALUE_T, HASH_T, KEY_EQ_T > CLASSNAME
+
+#else // !wxUSE_STL || !defined(HAVE_STL_HASH_MAP)
+
+
+#ifdef __WXWINCE__
+typedef int ptrdiff_t;
+#else
+#include <stddef.h>             // for ptrdiff_t
+#endif

 
 // private
 
 // private

-struct WXDLLEXPORT _wxHashTable_NodeBase
+struct WXDLLIMPEXP_BASE _wxHashTable_NodeBase

 {
     _wxHashTable_NodeBase() : m_nxt(0) {}
 
     _wxHashTable_NodeBase* m_nxt;
 {
     _wxHashTable_NodeBase() : m_nxt(0) {}
 
     _wxHashTable_NodeBase* m_nxt;

+
+// Cannot do this:
+//  DECLARE_NO_COPY_CLASS(_wxHashTable_NodeBase)
+// without rewriting the macros, which require a public copy constructor.

 };
 
 // private
 };
 
 // private

-class WXDLLEXPORT _wxHashTableBase2
+class WXDLLIMPEXP_BASE _wxHashTableBase2

 {
 public:
     typedef void (*NodeDtor)(_wxHashTable_NodeBase*);
 {
 public:
     typedef void (*NodeDtor)(_wxHashTable_NodeBase*);

-    typedef unsigned long (*BucketFromNode)(_wxHashTableBase2*,_wxHashTable_NodeBase*); 
+    typedef unsigned long (*BucketFromNode)(_wxHashTableBase2*,_wxHashTable_NodeBase*);

     typedef _wxHashTable_NodeBase* (*ProcessNode)(_wxHashTable_NodeBase*);
 protected:
     static _wxHashTable_NodeBase* DummyProcessNode(_wxHashTable_NodeBase* node);
     typedef _wxHashTable_NodeBase* (*ProcessNode)(_wxHashTable_NodeBase*);
 protected:
     static _wxHashTable_NodeBase* DummyProcessNode(_wxHashTable_NodeBase* node);


@@ -46,15 +77,15 @@ protected:
         return 0;
     }
 
         return 0;
     }
 

-    /* static const unsigned prime_count = 31; */
+    // as static const unsigned prime_count = 31 but works with all compilers

     enum { prime_count = 31 };
     enum { prime_count = 31 };

-    static const unsigned long s_primes[prime_count];
+    static const unsigned long ms_primes[prime_count];

 
 

-    /* returns the first prime in s_primes greater than n */
+    // returns the first prime in ms_primes greater than n

     static unsigned long GetNextPrime( unsigned long n );
 
     static unsigned long GetNextPrime( unsigned long n );
 

-    /* returns the first prime in s_primes smaller than n */
-    /* ( or s_primes[0] if n is very small ) */
+    // returns the first prime in ms_primes smaller than n
+    // ( or ms_primes[0] if n is very small )

     static unsigned long GetPreviousPrime( unsigned long n );
 
     static void CopyHashTable( _wxHashTable_NodeBase** srcTable,
     static unsigned long GetPreviousPrime( unsigned long n );
 
     static void CopyHashTable( _wxHashTable_NodeBase** srcTable,


@@ -62,19 +93,18 @@ protected:
                                _wxHashTable_NodeBase** dstTable,
                                BucketFromNode func, ProcessNode proc );
 
                                _wxHashTable_NodeBase** dstTable,
                                BucketFromNode func, ProcessNode proc );
 

-    /* maybe just use calloc */
-    static void** AllocTable( size_t size )
+    static void** AllocTable( size_t sz )

     {
     {

-        void** table = new void*[size];
-
-        memset( table, 0, size * sizeof(void*) );
-
-        return table;
+        return (void **)calloc(sz, sizeof(void*));
+    }
+    static void FreeTable(void *table)
+    {
+        free(table);

     }
 };
 
 #define _WX_DECLARE_HASHTABLE( VALUE_T, KEY_T, HASH_T, KEY_EX_T, KEY_EQ_T, CLASSNAME, CLASSEXP, SHOULD_GROW, SHOULD_SHRINK ) \
     }
 };
 
 #define _WX_DECLARE_HASHTABLE( VALUE_T, KEY_T, HASH_T, KEY_EX_T, KEY_EQ_T, CLASSNAME, CLASSEXP, SHOULD_GROW, SHOULD_SHRINK ) \

-CLASSEXP CLASSNAME:protected _wxHashTableBase2 \
+CLASSEXP CLASSNAME : protected _wxHashTableBase2 \

 { \
 public: \
     typedef KEY_T key_type; \
 { \
 public: \
     typedef KEY_T key_type; \


@@ -91,18 +121,18 @@ public: \
     /* should these be protected? */ \
     typedef const KEY_T const_key_type; \
     typedef const VALUE_T const_mapped_type; \
     /* should these be protected? */ \
     typedef const KEY_T const_key_type; \
     typedef const VALUE_T const_mapped_type; \

-protected: \
+public: \

     struct Node; \
     typedef KEY_EX_T key_extractor; \
     typedef CLASSNAME Self; \
     struct Node; \
     typedef KEY_EX_T key_extractor; \
     typedef CLASSNAME Self; \

- \
+protected: \

     Node** m_table; \
     size_t m_tableBuckets; \
     size_t m_items; \
     hasher m_hasher; \
     key_equal m_equals; \
     key_extractor m_getKey; \
     Node** m_table; \
     size_t m_tableBuckets; \
     size_t m_items; \
     hasher m_hasher; \
     key_equal m_equals; \
     key_extractor m_getKey; \

- \
+public: \

     struct Node:public _wxHashTable_NodeBase \
     { \
     public: \
     struct Node:public _wxHashTable_NodeBase \
     { \
     public: \


@@ -113,19 +143,20 @@ protected: \
         value_type m_value; \
     }; \
  \
         value_type m_value; \
     }; \
  \

-    struct Iterator; \
-    friend struct CLASSNAME::Iterator; \
- \
+    CLASSEXP Iterator; \
+    friend CLASSEXP Iterator; \
+protected: \

     static void DeleteNode( _wxHashTable_NodeBase* node ) \
     { \
         delete (Node*)node; \
     } \
     static void DeleteNode( _wxHashTable_NodeBase* node ) \
     { \
         delete (Node*)node; \
     } \

- \
+public: \

     /*                  */ \
     /* forward iterator */ \
     /*                  */ \
     /*                  */ \
     /* forward iterator */ \
     /*                  */ \

-    struct Iterator \
+    CLASSEXP Iterator \

     { \
     { \

+    public: \

         Node* m_node; \
         Self* m_ht; \
  \
         Node* m_node; \
         Self* m_ht; \
  \


@@ -139,7 +170,7 @@ protected: \
     protected: \
         Node* GetNextNode() \
         { \
     protected: \
         Node* GetNextNode() \
         { \

-           size_type bucket = GetBucketForNode(m_ht,m_node); \
+            size_type bucket = GetBucketForNode(m_ht,m_node); \

             for( size_type i = bucket + 1; i < m_ht->m_tableBuckets; ++i ) \
             { \
                 if( m_ht->m_table[i] ) \
             for( size_type i = bucket + 1; i < m_ht->m_tableBuckets; ++i ) \
             { \
                 if( m_ht->m_table[i] ) \


@@ -151,13 +182,14 @@ protected: \
         void PlusPlus() \
         { \
             Node* next = m_node->m_next(); \
         void PlusPlus() \
         { \
             Node* next = m_node->m_next(); \

-           m_node = next ? next : GetNextNode(); \
+            m_node = next ? next : GetNextNode(); \

         } \
     }; \
  \
 public: \
         } \
     }; \
  \
 public: \

-    struct iterator:public Iterator \
+    CLASSEXP iterator : public Iterator \

     { \
     { \

+    public: \

         iterator() : Iterator() {} \
         iterator( Node* node, Self* ht ) : Iterator( node, ht ) {} \
         iterator& operator++() { PlusPlus(); return *this; } \
         iterator() : Iterator() {} \
         iterator( Node* node, Self* ht ) : Iterator( node, ht ) {} \
         iterator& operator++() { PlusPlus(); return *this; } \


@@ -166,9 +198,11 @@ public: \
         pointer operator ->() const { return &(m_node->m_value); } \
     }; \
  \
         pointer operator ->() const { return &(m_node->m_value); } \
     }; \
  \

-    struct const_iterator:public Iterator \
+    CLASSEXP const_iterator : public Iterator \

     { \
     { \

+    public: \

         const_iterator() : Iterator() {} \
         const_iterator() : Iterator() {} \

+        const_iterator(iterator i) : Iterator(i) {} \

         const_iterator( Node* node, const Self* ht ) \
             : Iterator( node, (Self*)ht ) {} \
         const_iterator& operator++() { PlusPlus();return *this; } \
         const_iterator( Node* node, const Self* ht ) \
             : Iterator( node, (Self*)ht ) {} \
         const_iterator& operator++() { PlusPlus();return *this; } \


@@ -177,10 +211,10 @@ public: \
         const_pointer operator ->() const { return &(m_node->m_value); } \
     }; \
  \
         const_pointer operator ->() const { return &(m_node->m_value); } \
     }; \
  \

-    CLASSNAME( size_type size = 10, const hasher& hfun = hasher(), \
+    CLASSNAME( size_type sz = 10, const hasher& hfun = hasher(), \

                const key_equal& k_eq = key_equal(), \
                const key_extractor& k_ex = key_extractor() ) \
                const key_equal& k_eq = key_equal(), \
                const key_extractor& k_ex = key_extractor() ) \

-        : m_tableBuckets( GetNextPrime( size ) ), \
+        : m_tableBuckets( GetNextPrime( (unsigned long) sz ) ), \

           m_items( 0 ), \
           m_hasher( hfun ), \
           m_equals( k_eq ), \
           m_items( 0 ), \
           m_hasher( hfun ), \
           m_equals( k_eq ), \


@@ -208,14 +242,14 @@ public: \
          m_getKey = ht.m_getKey; \
          m_items = ht.m_items; \
          HashCopy( ht ); \
          m_getKey = ht.m_getKey; \
          m_items = ht.m_items; \
          HashCopy( ht ); \

-        return *this; \
+         return *this; \

     } \
  \
     ~CLASSNAME() \
     { \
         clear(); \
  \
     } \
  \
     ~CLASSNAME() \
     { \
         clear(); \
  \

-        delete[] m_table; \
+        FreeTable(m_table); \

     } \
  \
     hasher hash_funct() { return m_hasher; } \
     } \
  \
     hasher hash_funct() { return m_hasher; } \


@@ -223,7 +257,12 @@ public: \
  \
     /* removes all elements from the hash table, but does not */ \
     /* shrink it ( perhaps it should ) */ \
  \
     /* removes all elements from the hash table, but does not */ \
     /* shrink it ( perhaps it should ) */ \

-    void clear() { DeleteNodes( m_tableBuckets, (_wxHashTable_NodeBase**)m_table, DeleteNode ); } \
+    void clear() \
+    { \
+        DeleteNodes( m_tableBuckets, (_wxHashTable_NodeBase**)m_table, \
+                     DeleteNode ); \
+        m_items = 0; \
+    } \

  \
     size_type size() const { return m_items; } \
     size_type max_size() const { return size_type(-1); } \
  \
     size_type size() const { return m_items; } \
     size_type max_size() const { return size_type(-1); } \


@@ -248,7 +287,7 @@ public: \
         delete *node; \
         (*node) = temp; \
         if( SHOULD_SHRINK( m_tableBuckets, m_items ) ) \
         delete *node; \
         (*node) = temp; \
         if( SHOULD_SHRINK( m_tableBuckets, m_items ) ) \

-            ResizeTable( GetPreviousPrime( m_tableBuckets ) - 1 ); \
+            ResizeTable( GetPreviousPrime( (unsigned long) m_tableBuckets ) - 1 ); \

         return 1; \
     } \
  \
         return 1; \
     } \
  \


@@ -260,7 +299,7 @@ protected: \
     } \
     static Node* CopyNode( Node* node ) { return new Node( *node ); } \
  \
     } \
     static Node* CopyNode( Node* node ) { return new Node( *node ); } \
  \

-    Node* GetOrCreateNode( const value_type& value ) \
+    Node* GetOrCreateNode( const value_type& value, bool& created ) \

     { \
         const const_key_type& key = m_getKey( value ); \
         size_t bucket = m_hasher( key ) % m_tableBuckets; \
     { \
         const const_key_type& key = m_getKey( value ); \
         size_t bucket = m_hasher( key ) % m_tableBuckets; \


@@ -269,11 +308,18 @@ protected: \
         while( node ) \
         { \
             if( m_equals( m_getKey( node->m_value ), key ) ) \
         while( node ) \
         { \
             if( m_equals( m_getKey( node->m_value ), key ) ) \

+            { \
+                created = false; \

                 return node; \
                 return node; \

+            } \

             node = node->m_next(); \
         } \
             node = node->m_next(); \
         } \

- \
-        node = new Node( value ); \
+        created = true; \
+        return CreateNode( value, bucket); \
+    }\
+    Node * CreateNode( const value_type& value, size_t bucket ) \
+    {\
+        Node* node = new Node( value ); \

         node->m_nxt = m_table[bucket]; \
         m_table[bucket] = node; \
  \
         node->m_nxt = m_table[bucket]; \
         m_table[bucket] = node; \
  \


@@ -284,29 +330,34 @@ protected: \
  \
         return node; \
     } \
  \
         return node; \
     } \

+    void CreateNode( const value_type& value ) \
+    {\
+        CreateNode(value, m_hasher( m_getKey(value) ) % m_tableBuckets ); \
+    }\

  \
     /* returns NULL if not found */ \
     Node** GetNodePtr( const const_key_type& key ) const \
     { \
  \
     /* returns NULL if not found */ \
     Node** GetNodePtr( const const_key_type& key ) const \
     { \

-        unsigned long hash = m_hasher( key ); \
-        Node** node = &m_table[hash % m_tableBuckets]; \
+        size_t bucket = m_hasher( key ) % m_tableBuckets; \
+        Node** node = &m_table[bucket]; \

  \
         while( *node ) \
         { \
             if( m_equals( m_getKey( (*node)->m_value ), key ) ) \
                 return node; \
  \
         while( *node ) \
         { \
             if( m_equals( m_getKey( (*node)->m_value ), key ) ) \
                 return node; \

+            /* Tell the compiler to not do any strict-aliasing assumptions with a void cast? Can we make such a runtime guarantee? */ \

             node = (Node**)&(*node)->m_nxt; \
         } \
  \
             node = (Node**)&(*node)->m_nxt; \
         } \
  \

-        return 0; \
+        return NULL; \

     } \
  \
     /* returns NULL if not found */ \
     /* expressing it in terms of GetNodePtr is 5-8% slower :-( */ \
     Node* GetNode( const const_key_type& key ) const \
     { \
     } \
  \
     /* returns NULL if not found */ \
     /* expressing it in terms of GetNodePtr is 5-8% slower :-( */ \
     Node* GetNode( const const_key_type& key ) const \
     { \

-        unsigned long hash = m_hasher( key ); \
-        Node* node = m_table[hash % m_tableBuckets]; \
+        size_t bucket = m_hasher( key ) % m_tableBuckets; \
+        Node* node = m_table[bucket]; \

  \
         while( node ) \
         { \
  \
         while( node ) \
         { \


@@ -320,7 +371,7 @@ protected: \
  \
     void ResizeTable( size_t newSize ) \
     { \
  \
     void ResizeTable( size_t newSize ) \
     { \

-        newSize = GetNextPrime( newSize ); \
+        newSize = GetNextPrime( (unsigned long)newSize ); \

         Node** srcTable = m_table; \
         size_t srcBuckets = m_tableBuckets; \
         m_table = (Node**)AllocTable( newSize ); \
         Node** srcTable = m_table; \
         size_t srcBuckets = m_tableBuckets; \
         m_table = (Node**)AllocTable( newSize ); \


@@ -328,9 +379,9 @@ protected: \
  \
         CopyHashTable( (_wxHashTable_NodeBase**)srcTable, srcBuckets, \
                        this, (_wxHashTable_NodeBase**)m_table, \
  \
         CopyHashTable( (_wxHashTable_NodeBase**)srcTable, srcBuckets, \
                        this, (_wxHashTable_NodeBase**)m_table, \

-                       (BucketFromNode)&GetBucketForNode,\
+                       (BucketFromNode)GetBucketForNode,\

                        (ProcessNode)&DummyProcessNode ); \
                        (ProcessNode)&DummyProcessNode ); \

-        delete[] srcTable; \
+        FreeTable(srcTable); \

     } \
  \
     /* this must be called _after_ m_table has been cleaned */ \
     } \
  \
     /* this must be called _after_ m_table has been cleaned */ \


@@ -340,11 +391,13 @@ protected: \
         CopyHashTable( (_wxHashTable_NodeBase**)ht.m_table, ht.m_tableBuckets,\
                        (_wxHashTableBase2*)this, \
                        (_wxHashTable_NodeBase**)m_table, \
         CopyHashTable( (_wxHashTable_NodeBase**)ht.m_table, ht.m_tableBuckets,\
                        (_wxHashTableBase2*)this, \
                        (_wxHashTable_NodeBase**)m_table, \

-                       (BucketFromNode)&GetBucketForNode, \
-                       (ProcessNode)&CopyNode ); \
+                       (BucketFromNode)GetBucketForNode, \
+                       (ProcessNode)CopyNode ); \

     } \
 };
 
     } \
 };
 

+// defines an STL-like pair class CLASSNAME storing two fields: first of type
+// KEY_T and second of type VALUE_T

 #define _WX_DECLARE_PAIR( KEY_T, VALUE_T, CLASSNAME, CLASSEXP ) \
 CLASSEXP CLASSNAME \
 { \
 #define _WX_DECLARE_PAIR( KEY_T, VALUE_T, CLASSNAME, CLASSEXP ) \
 CLASSEXP CLASSNAME \
 { \


@@ -355,73 +408,164 @@ public: \
     typedef const VALUE_T const_t2; \
  \
     CLASSNAME( const const_t1& f, const const_t2& s ):first(t1(f)),second(t2(s)) {} \
     typedef const VALUE_T const_t2; \
  \
     CLASSNAME( const const_t1& f, const const_t2& s ):first(t1(f)),second(t2(s)) {} \

-    CLASSNAME( const const_t1& f ):first(t1(f)),second(t2()) {} \

  \
     t1 first; \
     t2 second; \
 };
 
  \
     t1 first; \
     t2 second; \
 };
 

+// defines the class CLASSNAME returning the key part (of type KEY_T) from a
+// pair of type PAIR_T

 #define _WX_DECLARE_HASH_MAP_KEY_EX( KEY_T, PAIR_T, CLASSNAME, CLASSEXP ) \
 CLASSEXP CLASSNAME \
 { \
 #define _WX_DECLARE_HASH_MAP_KEY_EX( KEY_T, PAIR_T, CLASSNAME, CLASSEXP ) \
 CLASSEXP CLASSNAME \
 { \

+    typedef KEY_T key_type; \
+    typedef PAIR_T pair_type; \
+    typedef const key_type const_key_type; \
+    typedef const pair_type const_pair_type; \
+    typedef const_key_type& const_key_reference; \
+    typedef const_pair_type& const_pair_reference; \

 public: \
 public: \

-    CLASSNAME() {}; \
-    KEY_T operator()( PAIR_T pair ) const { return pair.first; } \
+    CLASSNAME() { } \
+    const_key_reference operator()( const_pair_reference pair ) const { return pair.first; }\
+    \
+    /* the dummy assignment operator is needed to suppress compiler */ \
+    /* warnings from hash table class' operator=(): gcc complains about */ \
+    /* "statement with no effect" without it */ \
+    CLASSNAME& operator=(const CLASSNAME&) { return *this; } \

 };
 
 // grow/shrink predicates
 };
 
 // grow/shrink predicates

-inline bool never_grow( size_t, size_t ) { return FALSE; }
-inline bool never_shrink( size_t, size_t ) { return FALSE; }
+inline bool never_grow( size_t, size_t ) { return false; }
+inline bool never_shrink( size_t, size_t ) { return false; }

 inline bool grow_lf70( size_t buckets, size_t items )
 {
     return float(items)/float(buckets) >= 0.85;
 }
 
 inline bool grow_lf70( size_t buckets, size_t items )
 {
     return float(items)/float(buckets) >= 0.85;
 }
 

+#endif // !wxUSE_STL || !defined(HAVE_STL_HASH_MAP)
+
+// ----------------------------------------------------------------------------
+// hashing and comparison functors
+// ----------------------------------------------------------------------------
+
+// NB: implementation detail: all of these classes must have dummy assignment
+//     operators to suppress warnings about "statement with no effect" from gcc
+//     in the hash table class assignment operator (where they're assigned)
+
+#if wxUSE_STL && defined(HAVE_STL_HASH_MAP)
+
+// integer types
+class WXDLLIMPEXP_BASE wxIntegerHash
+{
+    WX_HASH_MAP_NAMESPACE::hash<long> longHash;
+    WX_HASH_MAP_NAMESPACE::hash<unsigned long> ulongHash;
+    WX_HASH_MAP_NAMESPACE::hash<int> intHash;
+    WX_HASH_MAP_NAMESPACE::hash<unsigned int> uintHash;
+    WX_HASH_MAP_NAMESPACE::hash<short> shortHash;
+    WX_HASH_MAP_NAMESPACE::hash<unsigned short> ushortHash;
+
+#if defined wxLongLong_t && !defined wxLongLongIsLong
+    // hash<wxLongLong_t> ought to work but doesn't on some compilers
+    #if (!defined SIZEOF_LONG_LONG && SIZEOF_LONG == 4) \
+        || (defined SIZEOF_LONG_LONG && SIZEOF_LONG_LONG == SIZEOF_LONG * 2)
+    size_t longlongHash( wxLongLong_t x ) const
+    {
+        return longHash( wx_truncate_cast(long, x) ) ^
+               longHash( wx_truncate_cast(long, x >> (sizeof(long) * 8)) );
+    }
+    #elif defined SIZEOF_LONG_LONG && SIZEOF_LONG_LONG == SIZEOF_LONG
+    WX_HASH_MAP_NAMESPACE::hash<long> longlongHash;
+    #else
+    WX_HASH_MAP_NAMESPACE::hash<wxLongLong_t> longlongHash;
+    #endif
+#endif
+
+public:
+    wxIntegerHash() { }
+    size_t operator()( long x ) const { return longHash( x ); }
+    size_t operator()( unsigned long x ) const { return ulongHash( x ); }
+    size_t operator()( int x ) const { return intHash( x ); }
+    size_t operator()( unsigned int x ) const { return uintHash( x ); }
+    size_t operator()( short x ) const { return shortHash( x ); }
+    size_t operator()( unsigned short x ) const { return ushortHash( x ); }
+#if defined wxLongLong_t && !defined wxLongLongIsLong
+    size_t operator()( wxLongLong_t x ) const { return longlongHash(x); }
+    size_t operator()( wxULongLong_t x ) const { return longlongHash(x); }
+#endif
+
+    wxIntegerHash& operator=(const wxIntegerHash&) { return *this; }
+};
+
+#else // !wxUSE_STL || !defined(HAVE_STL_HASH_MAP)
+

 // integer types
 // integer types

-class WXDLLEXPORT wxIntegerHash
+class WXDLLIMPEXP_BASE wxIntegerHash

 {
 public:
 {
 public:

-    wxIntegerHash() {};
+    wxIntegerHash() { }

     unsigned long operator()( long x ) const { return (unsigned long)x; }
     unsigned long operator()( unsigned long x ) const { return x; }
     unsigned long operator()( int x ) const { return (unsigned long)x; }
     unsigned long operator()( unsigned int x ) const { return x; }
     unsigned long operator()( long x ) const { return (unsigned long)x; }
     unsigned long operator()( unsigned long x ) const { return x; }
     unsigned long operator()( int x ) const { return (unsigned long)x; }
     unsigned long operator()( unsigned int x ) const { return x; }

+    unsigned long operator()( short x ) const { return (unsigned long)x; }
+    unsigned long operator()( unsigned short x ) const { return x; }
+#if defined wxLongLong_t && !defined wxLongLongIsLong
+    wxULongLong_t operator()( wxLongLong_t x ) const { return wx_static_cast(wxULongLong_t, x); }
+    wxULongLong_t operator()( wxULongLong_t x ) const { return x; }
+#endif
+
+    wxIntegerHash& operator=(const wxIntegerHash&) { return *this; }

 };
 
 };
 

-class WXDLLEXPORT wxIntegerEqual
+#endif // !wxUSE_STL || !defined(HAVE_STL_HASH_MAP)
+
+class WXDLLIMPEXP_BASE wxIntegerEqual

 {
 public:
 {
 public:

-    wxIntegerEqual() {};
+    wxIntegerEqual() { }

     bool operator()( long a, long b ) const { return a == b; }
     bool operator()( long a, long b ) const { return a == b; }

-    bool operator()( unsigned long a, unsigned long b ) const
-        { return a == b; }
+    bool operator()( unsigned long a, unsigned long b ) const { return a == b; }

     bool operator()( int a, int b ) const { return a == b; }
     bool operator()( int a, int b ) const { return a == b; }

-    bool operator()( unsigned int a, unsigned int b ) const
-        { return a == b; }
+    bool operator()( unsigned int a, unsigned int b ) const { return a == b; }
+    bool operator()( short a, short b ) const { return a == b; }
+    bool operator()( unsigned short a, unsigned short b ) const { return a == b; }
+#if defined wxLongLong_t && !defined wxLongLongIsLong
+    bool operator()( wxLongLong_t a, wxLongLong_t b ) const { return a == b; }
+    bool operator()( wxULongLong_t a, wxULongLong_t b ) const { return a == b; }
+#endif
+
+    wxIntegerEqual& operator=(const wxIntegerEqual&) { return *this; }

 };
 
 // pointers
 };
 
 // pointers

-class WXDLLEXPORT wxPointerHash
+class WXDLLIMPEXP_BASE wxPointerHash

 {
 public:
 {
 public:

-    wxPointerHash() {};
-    unsigned long operator()( const void* k ) const
-        { return (unsigned long)k; }
+    wxPointerHash() { }
+
+#if wxUSE_STL && defined(HAVE_STL_HASH_MAP)
+    size_t operator()( const void* k ) const { return (size_t)k; }
+#else
+    wxUIntPtr operator()( const void* k ) const { return wxPtrToUInt(k); }
+#endif
+
+    wxPointerHash& operator=(const wxPointerHash&) { return *this; }

 };
 
 };
 

-class WXDLLEXPORT wxPointerEqual
+class WXDLLIMPEXP_BASE wxPointerEqual

 {
 public:
 {
 public:

-    wxPointerEqual() {};
-    bool operator()( const void* a, const void* b ) const
-        { return a == b; }
+    wxPointerEqual() { }
+    bool operator()( const void* a, const void* b ) const { return a == b; }
+
+    wxPointerEqual& operator=(const wxPointerEqual&) { return *this; }

 };
 
 // wxString, char*, wxChar*
 };
 
 // wxString, char*, wxChar*

-class WXDLLEXPORT wxStringHash
+class WXDLLIMPEXP_BASE wxStringHash

 {
 public:
 {
 public:

-    wxStringHash() {};
+    wxStringHash() {}

     unsigned long operator()( const wxString& x ) const
         { return wxCharStringHash( x.c_str() ); }
     unsigned long operator()( const wxChar* x ) const
     unsigned long operator()( const wxString& x ) const
         { return wxCharStringHash( x.c_str() ); }
     unsigned long operator()( const wxChar* x ) const


@@ -431,13 +575,15 @@ public:
     unsigned long operator()( const char* x ) const
         { return charStringHash( x ); }
     static unsigned long charStringHash( const char* );
     unsigned long operator()( const char* x ) const
         { return charStringHash( x ); }
     static unsigned long charStringHash( const char* );

-#endif
+#endif // wxUSE_UNICODE
+
+    wxStringHash& operator=(const wxStringHash&) { return *this; }

 };
 
 };
 

-class WXDLLEXPORT wxStringEqual
+class WXDLLIMPEXP_BASE wxStringEqual

 {
 public:
 {
 public:

-    wxStringEqual() {};
+    wxStringEqual() {}

     bool operator()( const wxString& a, const wxString& b ) const
         { return a == b; }
     bool operator()( const wxChar* a, const wxChar* b ) const
     bool operator()( const wxString& a, const wxString& b ) const
         { return a == b; }
     bool operator()( const wxChar* a, const wxChar* b ) const


@@ -445,9 +591,13 @@ public:
 #if wxUSE_UNICODE
     bool operator()( const char* a, const char* b ) const
         { return strcmp( a, b ) == 0; }
 #if wxUSE_UNICODE
     bool operator()( const char* a, const char* b ) const
         { return strcmp( a, b ) == 0; }

-#endif
+#endif // wxUSE_UNICODE
+
+    wxStringEqual& operator=(const wxStringEqual&) { return *this; }

 };
 
 };
 

+#if !wxUSE_STL || !defined(HAVE_STL_HASH_MAP)
+

 #define _WX_DECLARE_HASH_MAP( KEY_T, VALUE_T, HASH_T, KEY_EQ_T, CLASSNAME, CLASSEXP ) \
 _WX_DECLARE_PAIR( KEY_T, VALUE_T, CLASSNAME##_wxImplementation_Pair, CLASSEXP ) \
 _WX_DECLARE_HASH_MAP_KEY_EX( KEY_T, CLASSNAME##_wxImplementation_Pair, CLASSNAME##_wxImplementation_KeyEx, CLASSEXP ) \
 #define _WX_DECLARE_HASH_MAP( KEY_T, VALUE_T, HASH_T, KEY_EQ_T, CLASSNAME, CLASSEXP ) \
 _WX_DECLARE_PAIR( KEY_T, VALUE_T, CLASSNAME##_wxImplementation_Pair, CLASSEXP ) \
 _WX_DECLARE_HASH_MAP_KEY_EX( KEY_T, CLASSNAME##_wxImplementation_Pair, CLASSNAME##_wxImplementation_KeyEx, CLASSEXP ) \


@@ -456,13 +606,19 @@ CLASSEXP CLASSNAME:public CLASSNAME##_wxImplementation_HashTable \
 { \
 public: \
     typedef VALUE_T mapped_type; \
 { \
 public: \
     typedef VALUE_T mapped_type; \

+    _WX_DECLARE_PAIR( iterator, bool, Insert_Result, CLASSEXP ) \

  \
  \

-    CLASSNAME( size_type hint = 100, hasher hf = hasher(), key_equal eq = key_equal() ) \
-        : CLASSNAME##_wxImplementation_HashTable( hint, hf, eq, CLASSNAME##_wxImplementation_KeyEx() ) {} \
+    wxEXPLICIT CLASSNAME( size_type hint = 100, hasher hf = hasher(),        \
+                          key_equal eq = key_equal() )                       \
+        : CLASSNAME##_wxImplementation_HashTable( hint, hf, eq,              \
+                                   CLASSNAME##_wxImplementation_KeyEx() ) {} \

  \
     mapped_type& operator[]( const const_key_type& key ) \
     { \
  \
     mapped_type& operator[]( const const_key_type& key ) \
     { \

-        return GetOrCreateNode( CLASSNAME##_wxImplementation_Pair( key ) )->m_value.second; \
+        bool created; \
+        return GetOrCreateNode( \
+                CLASSNAME##_wxImplementation_Pair( key, mapped_type() ), \
+                created)->m_value.second; \

     } \
  \
     const_iterator find( const const_key_type& key ) const \
     } \
  \
     const_iterator find( const const_key_type& key ) const \


@@ -475,7 +631,16 @@ public: \
         return iterator( GetNode( key ), this ); \
     } \
  \
         return iterator( GetNode( key ), this ); \
     } \
  \

-    void insert( const value_type& v ) { (*this)[v.first] = v.second; } \
+    Insert_Result insert( const value_type& v ) \
+    { \
+        bool created; \
+        Node *node = GetOrCreateNode( \
+                CLASSNAME##_wxImplementation_Pair( v.first, v.second ), \
+                created); \
+        if ( !created ) \
+            node->m_value.second = v.second; \
+        return Insert_Result(iterator(node, this), created); \
+    } \

  \
     size_type erase( const key_type& k ) \
         { return CLASSNAME##_wxImplementation_HashTable::erase( k ); } \
  \
     size_type erase( const key_type& k ) \
         { return CLASSNAME##_wxImplementation_HashTable::erase( k ); } \


@@ -484,8 +649,13 @@ public: \
  \
     /* count() == 0 | 1 */ \
     size_type count( const const_key_type& key ) \
  \
     /* count() == 0 | 1 */ \
     size_type count( const const_key_type& key ) \

-        { return GetNode( key ) ? 1 : 0; } \
-};
+    { \
+        /* explicit cast needed to suppress CodeWarrior warnings */ \
+        return (size_type)(GetNode( key ) ? 1 : 0); \
+    } \
+}
+
+#endif // !wxUSE_STL || !defined(HAVE_STL_HASH_MAP)

 
 // these macros are to be used in the user code
 #define WX_DECLARE_HASH_MAP( KEY_T, VALUE_T, HASH_T, KEY_EQ_T, CLASSNAME) \
 
 // these macros are to be used in the user code
 #define WX_DECLARE_HASH_MAP( KEY_T, VALUE_T, HASH_T, KEY_EQ_T, CLASSNAME) \


@@ -493,27 +663,56 @@ public: \
 
 #define WX_DECLARE_STRING_HASH_MAP( VALUE_T, CLASSNAME ) \
     _WX_DECLARE_HASH_MAP( wxString, VALUE_T, wxStringHash, wxStringEqual, \
 
 #define WX_DECLARE_STRING_HASH_MAP( VALUE_T, CLASSNAME ) \
     _WX_DECLARE_HASH_MAP( wxString, VALUE_T, wxStringHash, wxStringEqual, \

-                          CLASSNAME, class );
+                          CLASSNAME, class )

 
 #define WX_DECLARE_VOIDPTR_HASH_MAP( VALUE_T, CLASSNAME ) \
     _WX_DECLARE_HASH_MAP( void*, VALUE_T, wxPointerHash, wxPointerEqual, \
 
 #define WX_DECLARE_VOIDPTR_HASH_MAP( VALUE_T, CLASSNAME ) \
     _WX_DECLARE_HASH_MAP( void*, VALUE_T, wxPointerHash, wxPointerEqual, \

-                          CLASSNAME, class );
+                          CLASSNAME, class )

 
 // and these do exactly the same thing but should be used inside the
 // library
 
 // and these do exactly the same thing but should be used inside the
 // library

+#define WX_DECLARE_HASH_MAP_WITH_DECL( KEY_T, VALUE_T, HASH_T, KEY_EQ_T, CLASSNAME, DECL) \
+    _WX_DECLARE_HASH_MAP( KEY_T, VALUE_T, HASH_T, KEY_EQ_T, CLASSNAME, DECL )
+

 #define WX_DECLARE_EXPORTED_HASH_MAP( KEY_T, VALUE_T, HASH_T, KEY_EQ_T, CLASSNAME) \
 #define WX_DECLARE_EXPORTED_HASH_MAP( KEY_T, VALUE_T, HASH_T, KEY_EQ_T, CLASSNAME) \

-    _WX_DECLARE_HASH_MAP( KEY_T, VALUE_T, HASH_T, KEY_EQ_T, CLASSNAME, class WXDLLEXPORT )
+    WX_DECLARE_HASH_MAP_WITH_DECL( KEY_T, VALUE_T, HASH_T, KEY_EQ_T, \
+                                   CLASSNAME, class WXDLLEXPORT )

 
 

-#define WX_DECLARE_EXPORTED_STRING_HASH_MAP( VALUE_T, CLASSNAME ) \
+#define WX_DECLARE_STRING_HASH_MAP_WITH_DECL( VALUE_T, CLASSNAME, DECL ) \

     _WX_DECLARE_HASH_MAP( wxString, VALUE_T, wxStringHash, wxStringEqual, \
     _WX_DECLARE_HASH_MAP( wxString, VALUE_T, wxStringHash, wxStringEqual, \

-                          CLASSNAME, class WXDLLEXPORT );
+                          CLASSNAME, DECL )

 
 

-#define WX_DECLARE_EXPORTED_VOIDPTR_HASH_MAP( VALUE_T, CLASSNAME ) \
+#define WX_DECLARE_EXPORTED_STRING_HASH_MAP( VALUE_T, CLASSNAME ) \
+    WX_DECLARE_STRING_HASH_MAP_WITH_DECL( VALUE_T, CLASSNAME, \
+                                          class WXDLLEXPORT )
+
+#define WX_DECLARE_VOIDPTR_HASH_MAP_WITH_DECL( VALUE_T, CLASSNAME, DECL ) \

     _WX_DECLARE_HASH_MAP( void*, VALUE_T, wxPointerHash, wxPointerEqual, \
     _WX_DECLARE_HASH_MAP( void*, VALUE_T, wxPointerHash, wxPointerEqual, \

-                          CLASSNAME, class WXDLLEXPORT );
+                          CLASSNAME, DECL )
+
+#define WX_DECLARE_EXPORTED_VOIDPTR_HASH_MAP( VALUE_T, CLASSNAME ) \
+    WX_DECLARE_VOIDPTR_HASH_MAP_WITH_DECL( VALUE_T, CLASSNAME, \
+                                           class WXDLLEXPORT )
+
+// delete all hash elements
+//
+// NB: the class declaration of the hash elements must be visible from the
+//     place where you use this macro, otherwise the proper destructor may not
+//     be called (a decent compiler should give a warning about it, but don't
+//     count on it)!
+#define WX_CLEAR_HASH_MAP(type, hashmap)                                     \
+    {                                                                        \
+        type::iterator it, en;                                               \
+        for( it = (hashmap).begin(), en = (hashmap).end(); it != en; ++it )  \
+            delete it->second;                                               \
+        (hashmap).clear();                                                   \
+    }
+
+//---------------------------------------------------------------------------
+// Declarations of common hashmap classes
+
+WX_DECLARE_HASH_MAP_WITH_DECL( long, long, wxIntegerHash, wxIntegerEqual,
+                               wxLongToLongHashMap, class WXDLLIMPEXP_BASE );

 
 

-#endif

 
 

-// Local variables:
-// mode: c++
-// End:
+#endif // _WX_HASHMAP_H_