X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/55d99c7a77789ff4904bf96eddca3715eb5af9b9..a0c6a355b7b53866286ec6263b99f787cfdbe731:/src/common/hash.cpp

diff --git a/src/common/hash.cpp b/src/common/hash.cpp
index 9882539bb4..db33f96e28 100644
--- a/src/common/hash.cpp
+++ b/src/common/hash.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "hash.h"
 #endif
 
@@ -34,6 +34,8 @@
 
 #include "wx/hash.h"
 
+#if !wxUSE_STL
+
 #include <string.h>
 #include <stdarg.h>
 
@@ -119,6 +121,8 @@ wxNodeBase *wxHashTableBase::GetNode(long key, long value) const
     return node;
 }
 
+#if WXWIN_COMPATIBILITY_2_4
+
 // ----------------------------------------------------------------------------
 // wxHashTableLong
 // ----------------------------------------------------------------------------
@@ -334,6 +338,8 @@ bool wxStringHashTable::Delete(long key) const
     return FALSE;
 }
 
+#endif // WXWIN_COMPATIBILITY_2_4
+
 // ----------------------------------------------------------------------------
 // old not type safe wxHashTable
 // ----------------------------------------------------------------------------
@@ -718,3 +724,4 @@ void wxHashTable::Clear ()
   m_count = 0;
 }
 
+#endif // !wxUSE_STL