applied Mandrake patch to expat, fixes compilation

[wxWidgets.git] / include / wx / hashmap.h

diff --git a/include/wx/hashmap.h b/include/wx/hashmap.h
index 87a911d53a66bdfa95e1c92985490123b0517aeb..896cd12db0b54f63edf1572bd100532c381101c4 100644 (file)
--- a/include/wx/hashmap.h
+++ b/include/wx/hashmap.h
@@ -74,11 +74,7 @@ protected:
 
     static void** AllocTable( size_t sz )
     {
-#ifdef __WXWINCE__
-        return (void **)malloc(sz * sizeof(void*));
-#else
         return (void **)calloc(sz, sizeof(void*));
-#endif
     }
 };
 
@@ -579,7 +575,7 @@ public: \
 //     count on it)!
 #define WX_CLEAR_HASH_MAP(type, hashmap)                                     \
     {                                                                        \
-        type##::iterator it, en;                                             \
+        type::iterator it, en;                                               \
         for( it = (hashmap).begin(), en = (hashmap).end(); it != en; ++it )  \
             delete it->second;                                               \
         (hashmap).clear();                                                   \