Set wxABI_VERSION default value to e.g. 29999 so that new APIs can be wrapped

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

diff --git a/include/wx/hashmap.h b/include/wx/hashmap.h
index b8689b86f6e9f7bc151fbedfde44f4e79f27e930..b1d2f0631423e10a00dba891b70db75f525bfdc2 100644 (file)
--- a/include/wx/hashmap.h
+++ b/include/wx/hashmap.h
@@ -341,7 +341,7 @@ protected: \
     /* 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 ); \
+        unsigned long hash = wx_static_cast(unsigned long, m_hasher( key )); \

         Node** node = &m_table[hash % m_tableBuckets]; \
  \
         while( *node ) \
         Node** node = &m_table[hash % m_tableBuckets]; \
  \
         while( *node ) \


@@ -358,7 +358,7 @@ protected: \
     /* expressing it in terms of GetNodePtr is 5-8% slower :-( */ \
     Node* GetNode( const const_key_type& key ) const \
     { \
     /* expressing it in terms of GetNodePtr is 5-8% slower :-( */ \
     Node* GetNode( const const_key_type& key ) const \
     { \

-        unsigned long hash = m_hasher( key ); \
+        unsigned long hash = wx_static_cast(unsigned long, m_hasher( key )); \

         Node* node = m_table[hash % m_tableBuckets]; \
  \
         while( node ) \
         Node* node = m_table[hash % m_tableBuckets]; \
  \
         while( node ) \