projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wxDatePicker and wxDateTime for PalmOS. Remove conflict with internal maxDays in...
[wxWidgets.git]
/
src
/
common
/
hashmap.cpp
diff --git
a/src/common/hashmap.cpp
b/src/common/hashmap.cpp
index f86e192644112e39b65f9a497f845721f527c447..6fa9127e7e24acabd571de34f9b2cfacb8ccae71 100644
(file)
--- a/
src/common/hashmap.cpp
+++ b/
src/common/hashmap.cpp
@@
-60,6
+60,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
+153,4
@@
_wxHashTable_NodeBase* _wxHashTableBase2::DummyProcessNode(_wxHashTable_NodeBase
return node;
}
return node;
}
+#endif // !wxUSE_STL || !defined(HAVE_STL_HASH_MAP)