From: Václav Slavík Date: Fri, 8 Feb 2002 23:38:53 +0000 (+0000) Subject: reverted revision 1.6 -- Mattia obviously knows better than I do... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/bc850f29e6513d10d7dba66996adaf66ba64ab77?ds=sidebyside reverted revision 1.6 -- Mattia obviously knows better than I do... git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/hashmap.h b/include/wx/hashmap.h index f2a3f6642e..1715c403f8 100644 --- a/include/wx/hashmap.h +++ b/include/wx/hashmap.h @@ -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: \ @@ -110,12 +110,12 @@ protected: \ \ struct Iterator; \ friend struct Iterator; \ - \ +protected: \ static void DeleteNode( _wxHashTable_NodeBase* node ) \ { \ delete (Node*)node; \ } \ - \ +public: \ /* */ \ /* forward iterator */ \ /* */ \