X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c2bb85e9e38ee35758e0076485bb6665f2c229f5..0b7e6e7da208b6a95fb23cb50286a09dc90d96d2:/src/common/hash.cpp diff --git a/src/common/hash.cpp b/src/common/hash.cpp index 1aa13adf84..5ec47a519b 100644 --- a/src/common/hash.cpp +++ b/src/common/hash.cpp @@ -104,7 +104,7 @@ void wxHashTableBase::DeleteContents(bool flag) wxNodeBase *wxHashTableBase::GetNode(long key, long value) const { - size_t slot = (size_t)abs(key % m_hashSize); + size_t slot = (size_t)abs(key % (long)m_hashSize); wxNodeBase *node; if ( m_hashTable[slot] ) @@ -123,6 +123,11 @@ wxNodeBase *wxHashTableBase::GetNode(long key, long value) const // wxHashTableLong // ---------------------------------------------------------------------------- +wxHashTableLong::~wxHashTableLong() +{ + Destroy(); +} + void wxHashTableLong::Init(size_t size) { m_hashSize = size; @@ -156,7 +161,7 @@ void wxHashTableLong::Put(long key, long value) { wxCHECK_RET( m_hashSize, _T("must call Create() first") ); - size_t slot = (size_t)abs(key % m_hashSize); + size_t slot = (size_t)abs(key % (long)m_hashSize); if ( !m_keys[slot] ) { @@ -174,7 +179,7 @@ long wxHashTableLong::Get(long key) const { wxCHECK_MSG( m_hashSize, wxNOT_FOUND, _T("must call Create() first") ); - size_t slot = (size_t)abs(key % m_hashSize); + size_t slot = (size_t)abs(key % (long)m_hashSize); wxArrayLong *keys = m_keys[slot]; if ( keys ) @@ -196,7 +201,7 @@ long wxHashTableLong::Delete(long key) { wxCHECK_MSG( m_hashSize, wxNOT_FOUND, _T("must call Create() first") ); - size_t slot = (size_t)abs(key % m_hashSize); + size_t slot = (size_t)abs(key % (long)m_hashSize); wxArrayLong *keys = m_keys[slot]; if ( keys )