X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/760d3c7cd33a214ec4b3e09449b846e8eabde614..4f85606724061367d0d5ab79444990e36b0acfa6:/include/wx/hashmap.h diff --git a/include/wx/hashmap.h b/include/wx/hashmap.h index fbabe5b8f2..6b20a0e79f 100644 --- a/include/wx/hashmap.h +++ b/include/wx/hashmap.h @@ -297,19 +297,6 @@ protected: \ \ return node; \ } \ - void CreateNodeLast( const value_type& value ) \ - { \ - size_t bucket = m_hasher( m_getKey(value) ) % m_tableBuckets; \ - Node* curr = m_table[bucket], \ - * next = m_table[bucket]; \ - while( next ) { curr = next; next = next->m_next(); } \ - Node** ptr = curr ? (Node**)&curr->m_nxt : &m_table[bucket]; \ - *ptr = new Node( value ); \ - /* must be after the node is inserted */ \ - ++m_items; \ - if( SHOULD_GROW( m_tableBuckets, m_items ) ) \ - ResizeTable( m_tableBuckets ); \ - } \ void CreateNode( const value_type& value ) \ {\ CreateNode(value, m_hasher( m_getKey(value) ) % m_tableBuckets ); \ @@ -524,8 +511,10 @@ CLASSEXP CLASSNAME:public CLASSNAME##_wxImplementation_HashTable \ public: \ typedef VALUE_T mapped_type; \ \ - 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 ) \ { \