X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f803b25b44072e1dc84edc27e3cdae9e34c26edf..3ae00f5b5756cb67631400628acc94dd23fe03d7:/src/common/hash.cpp diff --git a/src/common/hash.cpp b/src/common/hash.cpp index ed736b1c5b..bc1a7583aa 100644 --- a/src/common/hash.cpp +++ b/src/common/hash.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: hash.cpp +// Name: src/common/hash.cpp // Purpose: wxHashTable implementation // Author: Julian Smart // Modified by: VZ at 25.02.00: type safe hashes with WX_DECLARE_HASH() @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "hash.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -288,7 +284,7 @@ void wxStringHashTable::Put(long key, const wxString& value) wxString wxStringHashTable::Get(long key, bool *wasFound) const { - wxCHECK_MSG( m_hashSize, _T(""), _T("must call Create() first") ); + wxCHECK_MSG( m_hashSize, wxEmptyString, _T("must call Create() first") ); size_t slot = (size_t)abs((int)(key % (long)m_hashSize)); @@ -311,7 +307,7 @@ wxString wxStringHashTable::Get(long key, bool *wasFound) const if ( wasFound ) *wasFound = false; - return _T(""); + return wxEmptyString; } bool wxStringHashTable::Delete(long key) const @@ -1018,9 +1014,12 @@ long wxHashTableBase::MakeKey( const wxChar *str ) return int_key; } -// +// ---------------------------------------------------------------------------- +// wxHashTable +// ---------------------------------------------------------------------------- wxHashTable::wxHashTable( const wxHashTable& table ) + : wxHashTableBase() { DoCopy( table ); } @@ -1037,7 +1036,7 @@ void wxHashTable::DoCopy( const wxHashTable& WXUNUSED(table) ) { Create( m_keyType, m_size ); - wxASSERT( false ); + wxFAIL; } void wxHashTable::DoDeleteContents( wxHashTableBase_Node* node )