From: Mattia Barbon Date: Tue, 8 Jul 2003 22:24:26 +0000 (+0000) Subject: More MSVC fixes . X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/375894195f3a1fb92fbde0aed2a92bfec1258d09 More MSVC fixes . git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/arrstr.h b/include/wx/arrstr.h index 9573613632..5e396cc283 100644 --- a/include/wx/arrstr.h +++ b/include/wx/arrstr.h @@ -201,9 +201,9 @@ public: // FIXME: same in dynarray.h class reverse_iterator { - typedef wxArrayString name; - typedef name::reference reference; - typedef name::pointer pointer; + typedef wxString value_type; + typedef value_type* pointer; + typedef value_type& reference; typedef reverse_iterator itor; friend itor operator+(int o, const itor& it); friend itor operator+(const itor& it, int o); @@ -227,9 +227,9 @@ public: class const_reverse_iterator { - typedef wxArrayString name; - typedef name::const_reference reference; - typedef name::const_pointer pointer; + typedef wxString value_type; + typedef const value_type* pointer; + typedef const value_type& reference; typedef const_reverse_iterator itor; friend itor operator+(int o, const itor& it); friend itor operator+(const itor& it, int o); diff --git a/include/wx/list.h b/include/wx/list.h index 56c3a67430..8e1d5169eb 100644 --- a/include/wx/list.h +++ b/include/wx/list.h @@ -661,14 +661,16 @@ private: { \ typedef name list; \ public: \ - typedef list::Node Node; \ + typedef nodetype Node; \ typedef iterator itor; \ - typedef list::value_type* ptr_type; \ + typedef T* value_type; \ + typedef value_type* ptr_type; \ + typedef value_type& reference; \ \ Node* m_node; \ Node* m_init; \ public: \ - typedef list::reference reference_type; \ + typedef reference reference_type; \ typedef ptr_type pointer_type; \ \ iterator(Node* node, Node* init) : m_node(node), m_init(init) {}\ @@ -700,14 +702,16 @@ private: { \ typedef name list; \ public: \ - typedef list::Node Node; \ + typedef nodetype Node; \ + typedef T* value_type; \ + typedef const value_type& const_reference; \ typedef const_iterator itor; \ - typedef list::value_type* ptr_type; \ + typedef value_type* ptr_type; \ \ Node* m_node; \ Node* m_init; \ public: \ - typedef list::const_reference reference_type; \ + typedef const_reference reference_type; \ typedef const ptr_type pointer_type; \ \ const_iterator(Node* node, Node* init) \ @@ -742,14 +746,16 @@ private: { \ typedef name list; \ public: \ - typedef list::Node Node; \ + typedef nodetype Node; \ + typedef T* value_type; \ typedef reverse_iterator itor; \ - typedef list::value_type* ptr_type; \ + typedef value_type* ptr_type; \ + typedef value_type& reference; \ \ Node* m_node; \ Node* m_init; \ public: \ - typedef list::reference reference_type; \ + typedef reference reference_type; \ typedef ptr_type pointer_type; \ \ reverse_iterator(Node* node, Node* init) \ @@ -780,14 +786,16 @@ private: { \ typedef name list; \ public: \ - typedef list::Node Node; \ + typedef nodetype Node; \ + typedef T* value_type; \ typedef const_reverse_iterator itor; \ - typedef list::value_type* ptr_type; \ + typedef value_type* ptr_type; \ + typedef const value_type& const_reference; \ \ Node* m_node; \ Node* m_init; \ public: \ - typedef list::const_reference reference_type; \ + typedef const_reference reference_type; \ typedef const ptr_type pointer_type; \ \ const_reverse_iterator(Node* node, Node* init) \