Applied patch for ArtProvider.

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

diff --git a/src/common/hashmap.cpp b/src/common/hashmap.cpp
index 19a385d4511bbeefb7062a8472043757340ab59f..6fa9127e7e24acabd571de34f9b2cfacb8ccae71 100644 (file)
--- a/src/common/hashmap.cpp
+++ b/src/common/hashmap.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "hashmap.h"
 #endif
 
@@ -60,6 +60,8 @@ unsigned long wxStringHash::charStringHash( const char* k )
 }
 #endif
 
+#if !wxUSE_STL || !defined(HAVE_STL_HASH_MAP)
+
 /* from SGI STL */
 const unsigned long _wxHashTableBase2::ms_primes[prime_count] =
 {
@@ -151,3 +153,4 @@ _wxHashTable_NodeBase* _wxHashTableBase2::DummyProcessNode(_wxHashTable_NodeBase
     return node;
 }
 
+#endif // !wxUSE_STL || !defined(HAVE_STL_HASH_MAP)