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

Fixes for wxHashTable when wxUSE_STL=1:

Browse Source 
wxHashTable must work like an hash_multimap, not an hash_map.
wxHashTable::Delete is supposed to actually delete entries
more tests in console sample.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23034 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2003-08-19 21:17:04 +00:00
parent 8b7ac60523
commit 760d3c7cd3
3 changed files with 76 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
include/wx/hash.h
View File

@@ -140,7 +140,24 @@ WX_DECLARE_EXPORTED_HASH_MAP( wxHashKeyValue,
void*,
wxHashTableHash,
wxHashTableEqual,
wxHashTableBaseBase );
wxHashTableBaseBaseBase );
// hack: we should really have HASH_MULTI(MAP|SET), but this requires
// less work
class WXDLLIMPEXP_BASE wxHashTableBaseBase : public wxHashTableBaseBaseBase
{
public:
wxHashTableBaseBase(size_t size, const wxHashTableHash& hash,
const wxHashTableEqual& equal)
: wxHashTableBaseBaseBase(size, hash, equal)
{ }
void multi_insert(const wxHashKeyValue& key, void* value)
{
CreateNodeLast(value_type(key, value));
}
};
class WXDLLIMPEXP_BASE wxHashTableBase
{
@@ -176,7 +193,7 @@ protected:
wxASSERT( m_keyType == wxKEY_INTEGER );
wxHashKeyValue k; k.integer = key;
m_map[k] = data;
m_map.multi_insert(k, data);
}
void DoPut( const wxChar* key, void* data )
@@ -184,17 +201,8 @@ protected:
wxASSERT( m_keyType == wxKEY_STRING );
wxHashKeyValue k;
k.string = (wxChar*)key;
wxHashTableBaseBase::iterator it = m_map.find(k);
if( it == m_map.end() )
{
k.string = new wxChar[wxStrlen(key) + 1];
wxStrcpy(k.string, key);
m_map[k] = data;
}
else
it->second = data;
k.string = wxStrcpy(new wxChar[wxStrlen(key) + 1], key);
m_map.multi_insert(k, data);
}
void* DoGet( long key ) const
@@ -407,8 +415,8 @@ public:
wxObject *Get(const wxChar *value) const { return (wxObject*)DoGet( value ); }
// Deletes entry and returns data if found
wxObject *Delete(long key) { return (wxObject*)DoGet( key ); }
wxObject *Delete(const wxChar *key) { return (wxObject*)DoGet( key ); }
wxObject *Delete(long key) { return (wxObject*)DoDelete( key ); }
wxObject *Delete(const wxChar *key) { return (wxObject*)DoDelete( key ); }
#if 0
// Construct your own integer key from a string, e.g. in case