AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More MSVC fixes .

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon 2003-07-08 22:24:26 +00:00
parent 44383ef7c6
commit 375894195f
2 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/wx/arrstr.h
View File

@ -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);

32
include/wx/list.h
View File

@ -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) \