X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/376e1129f716901418d40b4cf2959e888a13a2c5..7c41d11aed39e37811c50a0d04b1a6ae25071341:/include/wx/hashmap.h diff --git a/include/wx/hashmap.h b/include/wx/hashmap.h index 8323cf26d0..83c63c35c3 100644 --- a/include/wx/hashmap.h +++ b/include/wx/hashmap.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: hashmap.cpp +// Name: hashmap.h // Purpose: wxHashMap class // Author: Mattia Barbon // Modified by: @@ -16,7 +16,7 @@ #pragma interface "hashmap.h" #endif -#include +#include "wx/string.h" // private struct WXDLLEXPORT _wxHashTable_NodeBase @@ -86,18 +86,18 @@ public: \ /* should these be protected? */ \ typedef const KEY_T const_key_type; \ typedef const VALUE_T const_mapped_type; \ -protected: \ +public: \ struct Node; \ typedef KEY_EX_T key_extractor; \ typedef CLASSNAME Self; \ - \ +protected: \ Node** m_table; \ size_t m_tableBuckets; \ size_t m_items; \ hasher m_hasher; \ key_equal m_equals; \ key_extractor m_getKey; \ - \ +public: \ struct Node:public _wxHashTable_NodeBase \ { \ public: \ @@ -109,13 +109,13 @@ protected: \ }; \ \ struct Iterator; \ - friend struct CLASSNAME::Iterator; \ - \ + friend struct Iterator; \ +protected: \ static void DeleteNode( _wxHashTable_NodeBase* node ) \ { \ delete (Node*)node; \ } \ - \ +public: \ /* */ \ /* forward iterator */ \ /* */ \