VC 7.1 warning fix

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

diff --git a/src/common/hash.cpp b/src/common/hash.cpp
index f6eb300922c41b11fe1c74e0c24fa16cf1012707..1df6c30b78246c310426b7ade4065cb34300b014 100644 (file)
--- a/src/common/hash.cpp
+++ b/src/common/hash.cpp
@@ -5,7 +5,7 @@
 // Modified by: VZ at 25.02.00: type safe hashes with WX_DECLARE_HASH()
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by: VZ at 25.02.00: type safe hashes with WX_DECLARE_HASH()
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -34,6 +34,8 @@
 
 #include "wx/hash.h"
 
 
 #include "wx/hash.h"
 

+#if !wxUSE_STL
+

 #include <string.h>
 #include <stdarg.h>
 
 #include <string.h>
 #include <stdarg.h>
 


@@ -119,6 +121,8 @@ wxNodeBase *wxHashTableBase::GetNode(long key, long value) const
     return node;
 }
 
     return node;
 }
 

+#if WXWIN_COMPATIBILITY_2_4
+

 // ----------------------------------------------------------------------------
 // wxHashTableLong
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxHashTableLong
 // ----------------------------------------------------------------------------


@@ -334,6 +338,8 @@ bool wxStringHashTable::Delete(long key) const
     return FALSE;
 }
 
     return FALSE;
 }
 

+#endif // WXWIN_COMPATIBILITY_2_4
+

 // ----------------------------------------------------------------------------
 // old not type safe wxHashTable
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // old not type safe wxHashTable
 // ----------------------------------------------------------------------------


@@ -718,3 +724,4 @@ void wxHashTable::Clear ()
   m_count = 0;
 }
 
   m_count = 0;
 }
 

+#endif // !wxUSE_STL