From e1688485fd0c206f8e69d464cf84f40bc9ff4a7d Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 31 Jul 2004 21:05:38 +0000 Subject: [PATCH] Avoid warnings in the DLL builds git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28573 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/hashmap.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/include/wx/hashmap.h b/include/wx/hashmap.h index adf8035092..8cc00b57b9 100644 --- a/include/wx/hashmap.h +++ b/include/wx/hashmap.h @@ -143,8 +143,8 @@ public: \ value_type m_value; \ }; \ \ - struct Iterator; \ - friend struct Iterator; \ + CLASSEXP Iterator; \ + friend CLASSEXP Iterator; \ protected: \ static void DeleteNode( _wxHashTable_NodeBase* node ) \ { \ @@ -154,8 +154,9 @@ public: \ /* */ \ /* forward iterator */ \ /* */ \ - struct Iterator \ + CLASSEXP Iterator \ { \ + public: \ Node* m_node; \ Self* m_ht; \ \ @@ -186,8 +187,9 @@ public: \ }; \ \ public: \ - struct iterator:public Iterator \ + CLASSEXP iterator : public Iterator \ { \ + public: \ iterator() : Iterator() {} \ iterator( Node* node, Self* ht ) : Iterator( node, ht ) {} \ iterator& operator++() { PlusPlus(); return *this; } \ @@ -196,8 +198,9 @@ public: \ pointer operator ->() const { return &(m_node->m_value); } \ }; \ \ - struct const_iterator:public Iterator \ + CLASSEXP const_iterator : public Iterator \ { \ + public: \ const_iterator() : Iterator() {} \ const_iterator( Node* node, const Self* ht ) \ : Iterator( node, (Self*)ht ) {} \ -- 2.45.2