source id type is unsigned; minor cleanup

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

diff --git a/src/common/hashmap.cpp b/src/common/hashmap.cpp
index f86e192644112e39b65f9a497f845721f527c447..6612272118a24e813980c4740aab98e7a946e1c4 100644 (file)
--- a/src/common/hashmap.cpp
+++ b/src/common/hashmap.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        hashmap.cpp
+// Name:        src/common/hashmap.cpp

 // Purpose:     wxHashMap implementation
 // Author:      Mattia Barbon
 // Modified by:
 // Purpose:     wxHashMap implementation
 // Author:      Mattia Barbon
 // Modified by:


@@ -9,15 +9,11 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "hashmap.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
 
 #include "wx/hashmap.h"
 #endif
 
 #include "wx/hashmap.h"


@@ -60,6 +56,8 @@ unsigned long wxStringHash::charStringHash( const char* k )
 }
 #endif
 
 }
 #endif
 

+#if !wxUSE_STL || !defined(HAVE_STL_HASH_MAP)
+

 /* from SGI STL */
 const unsigned long _wxHashTableBase2::ms_primes[prime_count] =
 {
 /* from SGI STL */
 const unsigned long _wxHashTableBase2::ms_primes[prime_count] =
 {


@@ -151,3 +149,4 @@ _wxHashTable_NodeBase* _wxHashTableBase2::DummyProcessNode(_wxHashTable_NodeBase
     return node;
 }
 
     return node;
 }
 

+#endif // !wxUSE_STL || !defined(HAVE_STL_HASH_MAP)