X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/68c30476e796c7604eaf0679862d0a1104089644..303f0be79e904523d3b2e912ab1a5c7ab812d2b6:/include/wx/hashmap.h diff --git a/include/wx/hashmap.h b/include/wx/hashmap.h index 95314ada5a..f1b72a80f8 100644 --- a/include/wx/hashmap.h +++ b/include/wx/hashmap.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: hashmap.h +// Name: wx/hashmap.h // Purpose: wxHashMap class // Author: Mattia Barbon // Modified by: @@ -12,18 +12,37 @@ #ifndef _WX_HASHMAP_H_ #define _WX_HASHMAP_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "hashmap.h" -#endif - #include "wx/string.h" +#include "wx/wxcrt.h" + +// In wxUSE_STD_CONTAINERS build we prefer to use the standard hash map class +// but it can be either in non-standard hash_map header (old g++ and some other +// STL implementations) or in C++0x standard unordered_map which can in turn be +// available either in std::tr1 or std namespace itself +// +// To summarize: if std::unordered_map is available use it, otherwise use tr1 +// and finally fall back to non-standard hash_map #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 wxUSE_STD_CONTAINERS && \ + (defined(HAVE_STD_UNORDERED_MAP) || defined(HAVE_TR1_UNORDERED_MAP)) + +#if defined(HAVE_STD_UNORDERED_MAP) + #include + #define WX_HASH_MAP_NAMESPACE std +#elif defined(HAVE_TR1_UNORDERED_MAP) + #include + #define WX_HASH_MAP_NAMESPACE std::tr1 +#endif + +#define _WX_DECLARE_HASH_MAP( KEY_T, VALUE_T, HASH_T, KEY_EQ_T, CLASSNAME, CLASSEXP ) \ + typedef WX_HASH_MAP_NAMESPACE::unordered_map< KEY_T, VALUE_T, HASH_T, KEY_EQ_T > CLASSNAME + +#elif wxUSE_STD_CONTAINERS && defined(HAVE_STL_HASH_MAP) #if defined(HAVE_EXT_HASH_MAP) #include @@ -38,10 +57,11 @@ #endif #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; + 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) +#else // !wxUSE_STD_CONTAINERS || no std::{hash,unordered}_map class available +#define wxNEEDS_WX_HASH_MAP #ifdef __WXWINCE__ typedef int ptrdiff_t; @@ -52,12 +72,12 @@ typedef int ptrdiff_t; // private struct WXDLLIMPEXP_BASE _wxHashTable_NodeBase { - _wxHashTable_NodeBase() : m_nxt(0) {} + _wxHashTable_NodeBase() : m_next(NULL) {} - _wxHashTable_NodeBase* m_nxt; + _wxHashTable_NodeBase* m_next; // Cannot do this: -// DECLARE_NO_COPY_CLASS(_wxHashTable_NodeBase) +// wxDECLARE_NO_COPY_CLASS(_wxHashTable_NodeBase); // without rewriting the macros, which require a public copy constructor. }; @@ -78,7 +98,7 @@ protected: for( size_t i = 0; i < buckets; ++i ) if( table[i] ) return table[i]; - return 0; + return NULL; } // as static const unsigned prime_count = 31 but works with all compilers @@ -101,9 +121,15 @@ protected: { 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,\ + PTROPERATOR, CLASSNAME, CLASSEXP, \ + SHOULD_GROW, SHOULD_SHRINK ) \ CLASSEXP CLASSNAME : protected _wxHashTableBase2 \ { \ public: \ @@ -122,11 +148,10 @@ public: \ typedef const KEY_T const_key_type; \ typedef const VALUE_T const_mapped_type; \ public: \ - struct Node; \ typedef KEY_EX_T key_extractor; \ typedef CLASSNAME Self; \ protected: \ - Node** m_table; \ + _wxHashTable_NodeBase** m_table; \ size_t m_tableBuckets; \ size_t m_items; \ hasher m_hasher; \ @@ -138,30 +163,29 @@ public: \ public: \ Node( const value_type& value ) \ : m_value( value ) {} \ - Node* m_next() { return (Node*)this->m_nxt; } \ + Node* next() { return static_cast(m_next); } \ \ value_type m_value; \ }; \ \ - struct Iterator; \ - friend struct Iterator; \ protected: \ static void DeleteNode( _wxHashTable_NodeBase* node ) \ { \ - delete (Node*)node; \ + delete static_cast(node); \ } \ public: \ /* */ \ /* forward iterator */ \ /* */ \ - struct Iterator \ + CLASSEXP Iterator \ { \ + public: \ Node* m_node; \ Self* m_ht; \ \ - Iterator() : m_node(0), m_ht(0) {} \ + Iterator() : m_node(NULL), m_ht(NULL) {} \ Iterator( Node* node, const Self* ht ) \ - : m_node(node), m_ht((Self*)ht) {} \ + : m_node(node), m_ht(const_cast(ht)) {} \ bool operator ==( const Iterator& it ) const \ { return m_node == it.m_node; } \ bool operator !=( const Iterator& it ) const \ @@ -173,38 +197,42 @@ public: \ for( size_type i = bucket + 1; i < m_ht->m_tableBuckets; ++i ) \ { \ if( m_ht->m_table[i] ) \ - return m_ht->m_table[i]; \ + return static_cast(m_ht->m_table[i]); \ } \ - return 0; \ + return NULL; \ } \ \ void PlusPlus() \ { \ - Node* next = m_node->m_next(); \ + Node* next = m_node->next(); \ m_node = next ? next : GetNextNode(); \ } \ }; \ + friend class Iterator; \ \ 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 operator++(int) { iterator it=*this;PlusPlus();return it; } \ reference operator *() const { return m_node->m_value; } \ - pointer operator ->() const { return &(m_node->m_value); } \ + PTROPERATOR(pointer) \ }; \ \ - struct const_iterator:public Iterator \ + CLASSEXP const_iterator : public Iterator \ { \ + public: \ const_iterator() : Iterator() {} \ + const_iterator(iterator i) : Iterator(i) {} \ const_iterator( Node* node, const Self* ht ) \ - : Iterator( node, (Self*)ht ) {} \ + : Iterator(node, const_cast(ht)) {} \ const_iterator& operator++() { PlusPlus();return *this; } \ const_iterator operator++(int) { const_iterator it=*this;PlusPlus();return it; } \ const_reference operator *() const { return m_node->m_value; } \ - const_pointer operator ->() const { return &(m_node->m_value); } \ + PTROPERATOR(const_pointer) \ }; \ \ CLASSNAME( size_type sz = 10, const hasher& hfun = hasher(), \ @@ -216,11 +244,11 @@ public: \ m_equals( k_eq ), \ m_getKey( k_ex ) \ { \ - m_table = (Node**)AllocTable( m_tableBuckets ); \ + m_table = (_wxHashTable_NodeBase**)AllocTable(m_tableBuckets); \ } \ \ CLASSNAME( const Self& ht ) \ - : m_table( 0 ), \ + : m_table(NULL), \ m_tableBuckets( 0 ), \ m_items( ht.m_items ), \ m_hasher( ht.m_hasher ), \ @@ -232,12 +260,15 @@ public: \ \ const Self& operator=( const Self& ht ) \ { \ - clear(); \ - m_hasher = ht.m_hasher; \ - m_equals = ht.m_equals; \ - m_getKey = ht.m_getKey; \ - m_items = ht.m_items; \ - HashCopy( ht ); \ + if (&ht != this) \ + { \ + clear(); \ + m_hasher = ht.m_hasher; \ + m_equals = ht.m_equals; \ + m_getKey = ht.m_getKey; \ + m_items = ht.m_items; \ + HashCopy( ht ); \ + } \ return *this; \ } \ \ @@ -245,7 +276,7 @@ public: \ { \ clear(); \ \ - free(m_table); \ + FreeTable(m_table); \ } \ \ hasher hash_funct() { return m_hasher; } \ @@ -255,8 +286,7 @@ public: \ /* shrink it ( perhaps it should ) */ \ void clear() \ { \ - DeleteNodes( m_tableBuckets, (_wxHashTable_NodeBase**)m_table, \ - DeleteNode ); \ + DeleteNodes(m_tableBuckets, m_table, DeleteNode); \ m_items = 0; \ } \ \ @@ -264,23 +294,23 @@ public: \ size_type max_size() const { return size_type(-1); } \ bool empty() const { return size() == 0; } \ \ - const_iterator end() const { return const_iterator( 0, this ); } \ - iterator end() { return iterator( 0, this ); } \ + const_iterator end() const { return const_iterator(NULL, this); } \ + iterator end() { return iterator(NULL, this); } \ const_iterator begin() const \ - { return const_iterator( (Node*)GetFirstNode( m_tableBuckets, (_wxHashTable_NodeBase**)m_table ), this ); }; \ + { return const_iterator(static_cast(GetFirstNode(m_tableBuckets, m_table)), this); } \ iterator begin() \ - { return iterator( (Node*)GetFirstNode( m_tableBuckets, (_wxHashTable_NodeBase**)m_table ), this ); }; \ + { return iterator(static_cast(GetFirstNode(m_tableBuckets, m_table)), this); } \ \ size_type erase( const const_key_type& key ) \ { \ - Node** node = GetNodePtr( key ); \ + _wxHashTable_NodeBase** node = GetNodePtr(key); \ \ if( !node ) \ return 0; \ \ --m_items; \ - Node* temp = (*node)->m_next(); \ - delete *node; \ + _wxHashTable_NodeBase* temp = (*node)->m_next; \ + delete static_cast(*node); \ (*node) = temp; \ if( SHOULD_SHRINK( m_tableBuckets, m_items ) ) \ ResizeTable( GetPreviousPrime( (unsigned long) m_tableBuckets ) - 1 ); \ @@ -295,24 +325,28 @@ protected: \ } \ 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; \ - Node* node = m_table[bucket]; \ + Node* node = static_cast(m_table[bucket]); \ \ while( node ) \ { \ if( m_equals( m_getKey( node->m_value ), key ) ) \ + { \ + created = false; \ return node; \ - node = node->m_next(); \ + } \ + node = node->next(); \ } \ - return CreateNode( value , bucket); \ + 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]; \ + node->m_next = m_table[bucket]; \ m_table[bucket] = node; \ \ /* must be after the node is inserted */ \ @@ -328,60 +362,60 @@ protected: \ }\ \ /* returns NULL if not found */ \ - Node** GetNodePtr( const const_key_type& key ) const \ + _wxHashTable_NodeBase** 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; \ + _wxHashTable_NodeBase** node = &m_table[bucket]; \ \ while( *node ) \ { \ - if( m_equals( m_getKey( (*node)->m_value ), key ) ) \ + if (m_equals(m_getKey(static_cast(*node)->m_value), key)) \ return node; \ - node = (Node**)&(*node)->m_nxt; \ + node = &(*node)->m_next; \ } \ \ - 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 \ { \ - unsigned long hash = m_hasher( key ); \ - Node* node = m_table[hash % m_tableBuckets]; \ + size_t bucket = m_hasher( key ) % m_tableBuckets; \ + Node* node = static_cast(m_table[bucket]); \ \ while( node ) \ { \ if( m_equals( m_getKey( node->m_value ), key ) ) \ return node; \ - node = node->m_next(); \ + node = node->next(); \ } \ \ - return 0; \ + return NULL; \ } \ \ void ResizeTable( size_t newSize ) \ { \ newSize = GetNextPrime( (unsigned long)newSize ); \ - Node** srcTable = m_table; \ + _wxHashTable_NodeBase** srcTable = m_table; \ size_t srcBuckets = m_tableBuckets; \ - m_table = (Node**)AllocTable( newSize ); \ + m_table = (_wxHashTable_NodeBase**)AllocTable( newSize ); \ m_tableBuckets = newSize; \ \ - CopyHashTable( (_wxHashTable_NodeBase**)srcTable, srcBuckets, \ - this, (_wxHashTable_NodeBase**)m_table, \ + CopyHashTable( srcTable, srcBuckets, \ + this, m_table, \ (BucketFromNode)GetBucketForNode,\ (ProcessNode)&DummyProcessNode ); \ - free(srcTable); \ + FreeTable(srcTable); \ } \ \ /* this must be called _after_ m_table has been cleaned */ \ void HashCopy( const Self& ht ) \ { \ ResizeTable( ht.size() ); \ - CopyHashTable( (_wxHashTable_NodeBase**)ht.m_table, ht.m_tableBuckets,\ + CopyHashTable( ht.m_table, ht.m_tableBuckets, \ (_wxHashTableBase2*)this, \ - (_wxHashTable_NodeBase**)m_table, \ + m_table, \ (BucketFromNode)GetBucketForNode, \ (ProcessNode)CopyNode ); \ } \ @@ -393,12 +427,15 @@ protected: \ CLASSEXP CLASSNAME \ { \ public: \ + typedef KEY_T first_type; \ + typedef VALUE_T second_type; \ typedef KEY_T t1; \ typedef VALUE_T t2; \ typedef const KEY_T const_t1; \ 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, const const_t2& s) \ + : first(const_cast(f)), second(const_cast(s)) {} \ \ t1 first; \ t2 second; \ @@ -426,14 +463,14 @@ public: \ }; // 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; } -#endif // !wxUSE_STL || !defined(HAVE_STL_HASH_MAP) +#endif // various hash map implementations // ---------------------------------------------------------------------------- // hashing and comparison functors @@ -443,7 +480,7 @@ inline bool grow_lf70( size_t buckets, size_t items ) // 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) +#ifndef wxNEEDS_WX_HASH_MAP // integer types class WXDLLIMPEXP_BASE wxIntegerHash @@ -454,6 +491,23 @@ class WXDLLIMPEXP_BASE wxIntegerHash WX_HASH_MAP_NAMESPACE::hash uintHash; WX_HASH_MAP_NAMESPACE::hash shortHash; WX_HASH_MAP_NAMESPACE::hash ushortHash; + +#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG + // hash 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 longlongHash; + #else + WX_HASH_MAP_NAMESPACE::hash longlongHash; + #endif +#endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG + public: wxIntegerHash() { } size_t operator()( long x ) const { return longHash( x ); } @@ -462,11 +516,15 @@ public: 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 ); } +#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG + size_t operator()( wxLongLong_t x ) const { return longlongHash(x); } + size_t operator()( wxULongLong_t x ) const { return longlongHash(x); } +#endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG wxIntegerHash& operator=(const wxIntegerHash&) { return *this; } }; -#else // !wxUSE_STL || !defined(HAVE_STL_HASH_MAP) +#else // wxNEEDS_WX_HASH_MAP // integer types class WXDLLIMPEXP_BASE wxIntegerHash @@ -479,11 +537,15 @@ public: 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; } +#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG + wxULongLong_t operator()( wxLongLong_t x ) const { return static_cast(x); } + wxULongLong_t operator()( wxULongLong_t x ) const { return x; } +#endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG wxIntegerHash& operator=(const wxIntegerHash&) { return *this; } }; -#endif // !wxUSE_STL || !defined(HAVE_STL_HASH_MAP) +#endif // !wxNEEDS_WX_HASH_MAP/wxNEEDS_WX_HASH_MAP class WXDLLIMPEXP_BASE wxIntegerEqual { @@ -495,6 +557,10 @@ public: 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; } +#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG + 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 // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG wxIntegerEqual& operator=(const wxIntegerEqual&) { return *this; } }; @@ -505,12 +571,10 @@ class WXDLLIMPEXP_BASE wxPointerHash public: wxPointerHash() { } - // TODO: this might not work well on architectures with 64 bit pointers but - // 32 bit longs, we should use % ULONG_MAX there -#if wxUSE_STL && defined(HAVE_STL_HASH_MAP) - size_t operator()( const void* k ) const { return (size_t)k; } +#ifdef wxNEEDS_WX_HASH_MAP + wxUIntPtr operator()( const void* k ) const { return wxPtrToUInt(k); } #else - unsigned long operator()( const void* k ) const { return (unsigned long)wxPtrToULong(k); } + size_t operator()( const void* k ) const { return (size_t)k; } #endif wxPointerHash& operator=(const wxPointerHash&) { return *this; } @@ -525,21 +589,29 @@ public: wxPointerEqual& operator=(const wxPointerEqual&) { return *this; } }; -// wxString, char*, wxChar* +// wxString, char*, wchar_t* class WXDLLIMPEXP_BASE wxStringHash { public: wxStringHash() {} unsigned long operator()( const wxString& x ) const - { return wxCharStringHash( x.c_str() ); } - unsigned long operator()( const wxChar* x ) const - { return wxCharStringHash( x ); } - static unsigned long wxCharStringHash( const wxChar* ); -#if wxUSE_UNICODE + { return stringHash( x.wx_str() ); } + unsigned long operator()( const wchar_t* x ) const + { return stringHash( x ); } unsigned long operator()( const char* x ) const - { return charStringHash( x ); } - static unsigned long charStringHash( const char* ); -#endif // wxUSE_UNICODE + { return stringHash( x ); } + +#if WXWIN_COMPATIBILITY_2_8 + static unsigned long wxCharStringHash( const wxChar* x ) + { return stringHash(x); } + #if wxUSE_UNICODE + static unsigned long charStringHash( const char* x ) + { return stringHash(x); } + #endif +#endif // WXWIN_COMPATIBILITY_2_8 + + static unsigned long stringHash( const wchar_t* ); + static unsigned long stringHash( const char* ); wxStringHash& operator=(const wxStringHash&) { return *this; } }; @@ -560,16 +632,23 @@ public: wxStringEqual& operator=(const wxStringEqual&) { return *this; } }; -#if !wxUSE_STL || !defined(HAVE_STL_HASH_MAP) +#ifdef wxNEEDS_WX_HASH_MAP + +#define wxPTROP_NORMAL(pointer) \ + pointer operator ->() const { return &(m_node->m_value); } +#define wxPTROP_NOP(pointer) #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 ) \ -_WX_DECLARE_HASHTABLE( CLASSNAME##_wxImplementation_Pair, KEY_T, HASH_T, CLASSNAME##_wxImplementation_KeyEx, KEY_EQ_T, CLASSNAME##_wxImplementation_HashTable, CLASSEXP, grow_lf70, never_shrink ) \ +_WX_DECLARE_HASHTABLE( CLASSNAME##_wxImplementation_Pair, KEY_T, HASH_T, \ + CLASSNAME##_wxImplementation_KeyEx, KEY_EQ_T, wxPTROP_NORMAL, \ + CLASSNAME##_wxImplementation_HashTable, CLASSEXP, grow_lf70, never_shrink ) \ CLASSEXP CLASSNAME:public CLASSNAME##_wxImplementation_HashTable \ { \ public: \ typedef VALUE_T mapped_type; \ + _WX_DECLARE_PAIR( iterator, bool, Insert_Result, CLASSEXP ) \ \ wxEXPLICIT CLASSNAME( size_type hint = 100, hasher hf = hasher(), \ key_equal eq = key_equal() ) \ @@ -578,7 +657,10 @@ public: \ \ mapped_type& operator[]( const const_key_type& key ) \ { \ - return GetOrCreateNode( CLASSNAME##_wxImplementation_Pair( key, mapped_type() ) )->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 \ @@ -591,19 +673,28 @@ public: \ 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); \ + return Insert_Result(iterator(node, this), created); \ + } \ \ size_type erase( const key_type& k ) \ { return CLASSNAME##_wxImplementation_HashTable::erase( k ); } \ - void erase( const iterator& it ) { erase( it->first ); } \ - void erase( const const_iterator& it ) { erase( it->first ); } \ + void erase( const iterator& it ) { erase( (*it).first ); } \ \ /* 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) +#endif // wxNEEDS_WX_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) \ @@ -624,7 +715,7 @@ public: \ #define WX_DECLARE_EXPORTED_HASH_MAP( KEY_T, VALUE_T, HASH_T, KEY_EQ_T, CLASSNAME) \ WX_DECLARE_HASH_MAP_WITH_DECL( KEY_T, VALUE_T, HASH_T, KEY_EQ_T, \ - CLASSNAME, class WXDLLEXPORT ) + CLASSNAME, class WXDLLIMPEXP_CORE ) #define WX_DECLARE_STRING_HASH_MAP_WITH_DECL( VALUE_T, CLASSNAME, DECL ) \ _WX_DECLARE_HASH_MAP( wxString, VALUE_T, wxStringHash, wxStringEqual, \ @@ -632,7 +723,7 @@ public: \ #define WX_DECLARE_EXPORTED_STRING_HASH_MAP( VALUE_T, CLASSNAME ) \ WX_DECLARE_STRING_HASH_MAP_WITH_DECL( VALUE_T, CLASSNAME, \ - class WXDLLEXPORT ) + class WXDLLIMPEXP_CORE ) #define WX_DECLARE_VOIDPTR_HASH_MAP_WITH_DECL( VALUE_T, CLASSNAME, DECL ) \ _WX_DECLARE_HASH_MAP( void*, VALUE_T, wxPointerHash, wxPointerEqual, \ @@ -640,7 +731,7 @@ public: \ #define WX_DECLARE_EXPORTED_VOIDPTR_HASH_MAP( VALUE_T, CLASSNAME ) \ WX_DECLARE_VOIDPTR_HASH_MAP_WITH_DECL( VALUE_T, CLASSNAME, \ - class WXDLLEXPORT ) + class WXDLLIMPEXP_CORE ) // delete all hash elements // @@ -662,6 +753,11 @@ public: \ WX_DECLARE_HASH_MAP_WITH_DECL( long, long, wxIntegerHash, wxIntegerEqual, wxLongToLongHashMap, class WXDLLIMPEXP_BASE ); +WX_DECLARE_STRING_HASH_MAP_WITH_DECL( wxString, wxStringToStringHashMap, + class WXDLLIMPEXP_BASE ); -#endif // _WX_HASHMAP_H_ +WX_DECLARE_STRING_HASH_MAP_WITH_DECL( wxUIntPtr, wxStringToNumHashMap, + class WXDLLIMPEXP_BASE ); + +#endif // _WX_HASHMAP_H_