X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53a2db124c633f80bdb16336084262037d879a2c..f2049b683752950d1fe91aec07318e7f2122ff16:/include/wx/hashmap.h diff --git a/include/wx/hashmap.h b/include/wx/hashmap.h index 34931c5298..7d6e56d74c 100644 --- a/include/wx/hashmap.h +++ b/include/wx/hashmap.h @@ -15,12 +15,34 @@ #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 @@ -37,8 +59,9 @@ #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) +#else // !wxUSE_STD_CONTAINERS || no std::{hash,unordered}_map class available +#define wxNEEDS_WX_HASH_MAP #ifdef __WXWINCE__ typedef int ptrdiff_t; @@ -54,7 +77,7 @@ struct WXDLLIMPEXP_BASE _wxHashTable_NodeBase _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. }; @@ -138,7 +161,7 @@ public: \ public: \ Node( const value_type& value ) \ : m_value( value ) {} \ - Node* next() { return wx_static_cast(Node*, m_next); } \ + Node* next() { return static_cast(m_next); } \ \ value_type m_value; \ }; \ @@ -146,7 +169,7 @@ public: \ protected: \ static void DeleteNode( _wxHashTable_NodeBase* node ) \ { \ - delete wx_static_cast(Node*, node); \ + delete static_cast(node); \ } \ public: \ /* */ \ @@ -160,7 +183,7 @@ public: \ \ Iterator() : m_node(NULL), m_ht(NULL) {} \ Iterator( Node* node, const Self* ht ) \ - : m_node(node), m_ht(wx_const_cast(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 \ @@ -172,7 +195,7 @@ public: \ for( size_type i = bucket + 1; i < m_ht->m_tableBuckets; ++i ) \ { \ if( m_ht->m_table[i] ) \ - return wx_static_cast(Node*, m_ht->m_table[i]); \ + return static_cast(m_ht->m_table[i]); \ } \ return NULL; \ } \ @@ -203,7 +226,7 @@ public: \ const_iterator() : Iterator() {} \ const_iterator(iterator i) : Iterator(i) {} \ const_iterator( Node* node, const Self* ht ) \ - : Iterator(node, wx_const_cast(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; } \ @@ -272,9 +295,9 @@ public: \ const_iterator end() const { return const_iterator(NULL, this); } \ iterator end() { return iterator(NULL, this); } \ const_iterator begin() const \ - { return const_iterator(wx_static_cast(Node*, GetFirstNode(m_tableBuckets, m_table)), this); } \ + { return const_iterator(static_cast(GetFirstNode(m_tableBuckets, m_table)), this); } \ iterator begin() \ - { return iterator(wx_static_cast(Node*, GetFirstNode(m_tableBuckets, m_table)), this); } \ + { return iterator(static_cast(GetFirstNode(m_tableBuckets, m_table)), this); } \ \ size_type erase( const const_key_type& key ) \ { \ @@ -285,7 +308,7 @@ public: \ \ --m_items; \ _wxHashTable_NodeBase* temp = (*node)->m_next; \ - delete wx_static_cast(Node*, *node); \ + delete static_cast(*node); \ (*node) = temp; \ if( SHOULD_SHRINK( m_tableBuckets, m_items ) ) \ ResizeTable( GetPreviousPrime( (unsigned long) m_tableBuckets ) - 1 ); \ @@ -304,7 +327,7 @@ protected: \ { \ const const_key_type& key = m_getKey( value ); \ size_t bucket = m_hasher( key ) % m_tableBuckets; \ - Node* node = wx_static_cast(Node*, m_table[bucket]); \ + Node* node = static_cast(m_table[bucket]); \ \ while( node ) \ { \ @@ -344,7 +367,7 @@ protected: \ \ while( *node ) \ { \ - if (m_equals(m_getKey(wx_static_cast(Node*, *node)->m_value), key)) \ + if (m_equals(m_getKey(static_cast(*node)->m_value), key)) \ return node; \ node = &(*node)->m_next; \ } \ @@ -357,7 +380,7 @@ protected: \ Node* GetNode( const const_key_type& key ) const \ { \ size_t bucket = m_hasher( key ) % m_tableBuckets; \ - Node* node = wx_static_cast(Node*, m_table[bucket]); \ + Node* node = static_cast(m_table[bucket]); \ \ while( node ) \ { \ @@ -402,13 +425,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(wx_const_cast(t1&, f)), second(wx_const_cast(t2&, s)) {} \ + : first(const_cast(f)), second(const_cast(s)) {} \ \ t1 first; \ t2 second; \ @@ -443,7 +468,7 @@ 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 @@ -453,7 +478,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 @@ -465,7 +490,7 @@ class WXDLLIMPEXP_BASE wxIntegerHash WX_HASH_MAP_NAMESPACE::hash shortHash; WX_HASH_MAP_NAMESPACE::hash ushortHash; -#if defined wxLongLong_t && !defined wxLongLongIsLong +#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) @@ -479,7 +504,7 @@ class WXDLLIMPEXP_BASE wxIntegerHash #else WX_HASH_MAP_NAMESPACE::hash longlongHash; #endif -#endif +#endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG public: wxIntegerHash() { } @@ -489,15 +514,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 ); } -#if defined wxLongLong_t && !defined wxLongLongIsLong +#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 +#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 @@ -510,15 +535,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; } -#if defined wxLongLong_t && !defined wxLongLongIsLong - wxULongLong_t operator()( wxLongLong_t x ) const { return wx_static_cast(wxULongLong_t, 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 +#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 { @@ -530,10 +555,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; } -#if defined wxLongLong_t && !defined wxLongLongIsLong +#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 +#endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG wxIntegerEqual& operator=(const wxIntegerEqual&) { return *this; } }; @@ -544,10 +569,10 @@ class WXDLLIMPEXP_BASE wxPointerHash public: wxPointerHash() { } -#if wxUSE_STL && defined(HAVE_STL_HASH_MAP) - size_t operator()( const void* k ) const { return (size_t)k; } -#else +#ifdef wxNEEDS_WX_HASH_MAP wxUIntPtr operator()( const void* k ) const { return wxPtrToUInt(k); } +#else + size_t operator()( const void* k ) const { return (size_t)k; } #endif wxPointerHash& operator=(const wxPointerHash&) { return *this; } @@ -605,7 +630,7 @@ public: wxStringEqual& operator=(const wxStringEqual&) { return *this; } }; -#if !wxUSE_STL || !defined(HAVE_STL_HASH_MAP) +#ifdef wxNEEDS_WX_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 ) \ @@ -646,15 +671,12 @@ public: \ 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 ); } \ void erase( const iterator& it ) { erase( it->first ); } \ - void erase( const const_iterator& it ) { erase( it->first ); } \ \ /* count() == 0 | 1 */ \ size_type count( const const_key_type& key ) \ @@ -664,7 +686,7 @@ public: \ } \ } -#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) \ @@ -723,5 +745,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 ); + +WX_DECLARE_STRING_HASH_MAP_WITH_DECL( wxUIntPtr, wxStringToNumHashMap, + class WXDLLIMPEXP_BASE ); + #endif // _WX_HASHMAP_H_