Use correct reload flags on all platforms to avoid compilation errors

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

diff --git a/include/wx/hashmap.h b/include/wx/hashmap.h
index c6f6b0c20a10cd6a26f8040f6565c80324f8e46d..7d6e56d74c1fc87edd54eb5225bae2b3fb4539b2 100644 (file)
--- a/include/wx/hashmap.h
+++ b/include/wx/hashmap.h
@@ -15,9 +15,9 @@
 #include "wx/string.h"
 #include "wx/wxcrt.h"
 
-// In wxUSE_STL 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
+// 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
@@ -28,7 +28,7 @@
     #define HAVE_STL_HASH_MAP
 #endif
 
-#if wxUSE_STL && \
+#if wxUSE_STD_CONTAINERS && \
     (defined(HAVE_STD_UNORDERED_MAP) || defined(HAVE_TR1_UNORDERED_MAP))
 
 #if defined(HAVE_STD_UNORDERED_MAP)
@@ -42,7 +42,7 @@
 #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_STL && defined(HAVE_STL_HASH_MAP)
+#elif wxUSE_STD_CONTAINERS && defined(HAVE_STL_HASH_MAP)
 
 #if defined(HAVE_EXT_HASH_MAP)
     #include <ext/hash_map>
@@ -59,7 +59,7 @@
 #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 || no std::{hash,unordered}_map class available
+#else // !wxUSE_STD_CONTAINERS || no std::{hash,unordered}_map class available
 
 #define wxNEEDS_WX_HASH_MAP
 
@@ -77,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.
 };
 
@@ -161,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<Node*>(m_next); } \
  \
         value_type m_value; \
     }; \
@@ -169,7 +169,7 @@ public: \
 protected: \
     static void DeleteNode( _wxHashTable_NodeBase* node ) \
     { \
-        delete wx_static_cast(Node*, node); \
+        delete static_cast<Node*>(node); \
     } \
 public: \
     /*                  */ \
@@ -183,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<Self*>(ht)) {} \
         bool operator ==( const Iterator& it ) const \
             { return m_node == it.m_node; } \
         bool operator !=( const Iterator& it ) const \
@@ -195,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<Node*>(m_ht->m_table[i]); \
             } \
             return NULL; \
         } \
@@ -226,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<Self*>(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; } \
@@ -295,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<Node*>(GetFirstNode(m_tableBuckets, m_table)), this); } \
     iterator begin() \
-        { return iterator(wx_static_cast(Node*, GetFirstNode(m_tableBuckets, m_table)), this); } \
+        { return iterator(static_cast<Node*>(GetFirstNode(m_tableBuckets, m_table)), this); } \
  \
     size_type erase( const const_key_type& key ) \
     { \
@@ -308,7 +308,7 @@ public: \
  \
         --m_items; \
         _wxHashTable_NodeBase* temp = (*node)->m_next; \
-        delete wx_static_cast(Node*, *node); \
+        delete static_cast<Node*>(*node); \
         (*node) = temp; \
         if( SHOULD_SHRINK( m_tableBuckets, m_items ) ) \
             ResizeTable( GetPreviousPrime( (unsigned long) m_tableBuckets ) - 1 ); \
@@ -327,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<Node*>(m_table[bucket]); \
  \
         while( node ) \
         { \
@@ -367,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*>(*node)->m_value), key)) \
                 return node; \
             node = &(*node)->m_next; \
         } \
@@ -380,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<Node*>(m_table[bucket]); \
  \
         while( node ) \
         { \
@@ -425,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<t1&>(f)), second(const_cast<t2&>(s)) {} \
  \
     t1 first; \
     t2 second; \
@@ -488,7 +490,7 @@ class WXDLLIMPEXP_BASE wxIntegerHash
     WX_HASH_MAP_NAMESPACE::hash<short> shortHash;
     WX_HASH_MAP_NAMESPACE::hash<unsigned short> ushortHash;
 
-#if defined wxLongLong_t && !defined wxLongLongIsLong
+#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
     // 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)
@@ -502,7 +504,7 @@ class WXDLLIMPEXP_BASE wxIntegerHash
     #else
     WX_HASH_MAP_NAMESPACE::hash<wxLongLong_t> longlongHash;
     #endif
-#endif
+#endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
 
 public:
     wxIntegerHash() { }
@@ -512,10 +514,10 @@ 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; }
 };
@@ -533,10 +535,10 @@ 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<wxULongLong_t>(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; }
 };
@@ -553,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; }
 };
@@ -669,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 ) \
@@ -746,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_