Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

insert now returns pair<iterator, bool>, as for the standard map

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28504 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-07-25 23:05:28 +00:00
parent e5aa044ba4
commit fe8604acce
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
include/wx/hashmap.h
View File

@@ -295,7 +295,7 @@ protected: \
} \ } \
static Node* CopyNode( Node* node ) { return new Node( *node ); } \ 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 ); \ const const_key_type& key = m_getKey( value ); \
size_t bucket = m_hasher( key ) % m_tableBuckets; \ size_t bucket = m_hasher( key ) % m_tableBuckets; \
@@ -304,10 +304,14 @@ protected: \
while( node ) \ while( node ) \
{ \ { \
if( m_equals( m_getKey( node->m_value ), key ) ) \ if( m_equals( m_getKey( node->m_value ), key ) ) \
{ \
created = false; \
return node; \ return node; \
} \
node = node->m_next(); \ node = node->m_next(); \
} \ } \
return CreateNode( value , bucket); \ created = true; \
return CreateNode( value, bucket); \
}\ }\
Node * CreateNode( const value_type& value, size_t bucket ) \ Node * CreateNode( const value_type& value, size_t bucket ) \
{\ {\
@@ -570,6 +574,7 @@ CLASSEXP CLASSNAME:public CLASSNAME##_wxImplementation_HashTable \
{ \ { \
public: \ public: \
typedef VALUE_T mapped_type; \ typedef VALUE_T mapped_type; \
_WX_DECLARE_PAIR( iterator, bool, Insert_Result, CLASSEXP ) \
\ \
wxEXPLICIT CLASSNAME( size_type hint = 100, hasher hf = hasher(), \ wxEXPLICIT CLASSNAME( size_type hint = 100, hasher hf = hasher(), \
key_equal eq = key_equal() ) \ key_equal eq = key_equal() ) \
@@ -578,7 +583,10 @@ public: \
\ \
mapped_type& operator[]( const const_key_type& key ) \ 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 \ const_iterator find( const const_key_type& key ) const \
@@ -591,7 +599,16 @@ public: \
return iterator( GetNode( key ), this ); \ 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); \
if ( !created ) \
node->m_value.second = v.second; \
return Insert_Result(iterator(node, this), created); \
} \
\ \
size_type erase( const key_type& k ) \ size_type erase( const key_type& k ) \
{ return CLASSNAME##_wxImplementation_HashTable::erase( k ); } \ { return CLASSNAME##_wxImplementation_HashTable::erase( k ); } \