cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove ptr_type typedef from wxList iterator classes

Browse Source 
This typedef is completely redundant with pointer_type which had been
also available in these classes since the very beginning and seems to
have been meant to be private originally, so it should be safe to just
remove it, especially because I couldn't find any existing code using
it.

If we do find such code in the wild later, this commit could be reverted
as it's not really indispensable.
This commit is contained in:
Vadim Zeitlin 2018-02-23 16:00:42 +01:00
parent fdbe357e4b
commit 9edf06794e
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/wx/list.h
View File

@ -780,14 +780,13 @@ private:
\ \
typedef nodetype Node; \ typedef nodetype Node; \
typedef iterator itor; \ typedef iterator itor; \
typedef value_type* ptr_type; \
\ \
Node* m_node; \ Node* m_node; \
Node* m_init; \ Node* m_init; \
public: \ public: \
/* Compatibility typedefs, don't use */ \ /* Compatibility typedefs, don't use */ \
typedef reference reference_type; \ typedef reference reference_type; \
typedef ptr_type pointer_type; \ typedef pointer pointer_type; \
\ \
iterator(Node* node, Node* init) : m_node(node), m_init(init) {}\ iterator(Node* node, Node* init) : m_node(node), m_init(init) {}\
iterator() : m_node(NULL), m_init(NULL) { } \ iterator() : m_node(NULL), m_init(NULL) { } \
@ -834,13 +833,12 @@ private:
typedef nodetype Node; \ typedef nodetype Node; \
typedef const value_type& const_reference; \ typedef const value_type& const_reference; \
typedef const_iterator itor; \ typedef const_iterator itor; \
typedef value_type* ptr_type; \
\ \
Node* m_node; \ Node* m_node; \
Node* m_init; \ Node* m_init; \
public: \ public: \
typedef const_reference reference_type; \ typedef reference reference_type; \
typedef const ptr_type pointer_type; \ typedef pointer pointer_type; \
\ \
const_iterator(Node* node, Node* init) \ const_iterator(Node* node, Node* init) \
: m_node(node), m_init(init) { } \ : m_node(node), m_init(init) { } \
@ -889,13 +887,12 @@ private:
\ \
typedef nodetype Node; \ typedef nodetype Node; \
typedef reverse_iterator itor; \ typedef reverse_iterator itor; \
typedef value_type* ptr_type; \
\ \
Node* m_node; \ Node* m_node; \
Node* m_init; \ Node* m_init; \
public: \ public: \
typedef reference reference_type; \ typedef reference reference_type; \
typedef ptr_type pointer_type; \ typedef pointer pointer_type; \
\ \
reverse_iterator(Node* node, Node* init) \ reverse_iterator(Node* node, Node* init) \
: m_node(node), m_init(init) { } \ : m_node(node), m_init(init) { } \
@ -930,14 +927,13 @@ private:
\ \
typedef nodetype Node; \ typedef nodetype Node; \
typedef const_reverse_iterator itor; \ typedef const_reverse_iterator itor; \
typedef value_type* ptr_type; \
typedef const value_type& const_reference; \ typedef const value_type& const_reference; \
\ \
Node* m_node; \ Node* m_node; \
Node* m_init; \ Node* m_init; \
public: \ public: \
typedef const_reference reference_type; \ typedef reference reference_type; \
typedef const ptr_type pointer_type; \ typedef pointer pointer_type; \
\ \
const_reverse_iterator(Node* node, Node* init) \ const_reverse_iterator(Node* node, Node* init) \
: m_node(node), m_init(init) { } \ : m_node(node), m_init(init) { } \