--enable-debug shouldn't be in COMMON_CONFIGURE_OPTIONS, it's used for dbg packages...

[wxWidgets.git] / src / common / hash.cpp

diff --git a/src/common/hash.cpp b/src/common/hash.cpp
index ed736b1c5b5a33f188255b4ff64df7d75f8dda73..9a538b0fd98f5dee16a2aef2d0a1f99ff761ee4a 100644 (file)
--- 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()
 // Purpose:     wxHashTable implementation
 // Author:      Julian Smart
 // Modified by: VZ at 25.02.00: type safe hashes with WX_DECLARE_HASH()


@@ -17,23 +17,18 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // 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"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx/list.h"
+    #include "wx/list.h"
+    #include "wx/hash.h"

 #endif
 
 #endif
 

-#include "wx/hash.h"
-

 #if wxUSE_OLD_HASH_TABLE
 
 #include <string.h>
 #if wxUSE_OLD_HASH_TABLE
 
 #include <string.h>


@@ -288,7 +283,7 @@ void wxStringHashTable::Put(long key, const wxString& value)
 
 wxString wxStringHashTable::Get(long key, bool *wasFound) const
 {
 
 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));
 
 
     size_t slot = (size_t)abs((int)(key % (long)m_hashSize));
 


@@ -311,7 +306,7 @@ wxString wxStringHashTable::Get(long key, bool *wasFound) const
     if ( wasFound )
         *wasFound = false;
 
     if ( wasFound )
         *wasFound = false;
 

-    return _T("");
+    return wxEmptyString;

 }
 
 bool wxStringHashTable::Delete(long key) const
 }
 
 bool wxStringHashTable::Delete(long key) const


@@ -1018,9 +1013,12 @@ long wxHashTableBase::MakeKey( const wxChar *str )
     return int_key;
 }
 
     return int_key;
 }
 

-//
+// ----------------------------------------------------------------------------
+// wxHashTable
+// ----------------------------------------------------------------------------

 
 wxHashTable::wxHashTable( const wxHashTable& table )
 
 wxHashTable::wxHashTable( const wxHashTable& table )

+           : wxHashTableBase()

 {
     DoCopy( table );
 }
 {
     DoCopy( table );
 }


@@ -1037,7 +1035,7 @@ void wxHashTable::DoCopy( const wxHashTable& WXUNUSED(table) )
 {
     Create( m_keyType, m_size );
 
 {
     Create( m_keyType, m_size );
 

-    wxASSERT( false );
+    wxFAIL;

 }
 
 void wxHashTable::DoDeleteContents( wxHashTableBase_Node* node )
 }
 
 void wxHashTable::DoDeleteContents( wxHashTableBase_Node* node )