X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3e49e577462044be54d2bf1f5e16f48d56ba0975..92f1a59c288e0e181d2998a93220a73b89f675df:/include/wx/dynarray.h
diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h
index c1d42f59f3..3228aee579 100644
--- a/include/wx/dynarray.h
+++ b/include/wx/dynarray.h
@@ -114,7 +114,7 @@ protected: \
size_t IndexForInsert(T lItem, CMPFUNC fnCompare) const; \
void Add(T lItem, size_t nInsert = 1) \
{ insert(end(), nInsert, lItem); } \
- void Add(T lItem, CMPFUNC fnCompare); \
+ size_t Add(T lItem, CMPFUNC fnCompare); \
void Insert(T lItem, size_t uiIndex, size_t nInsert = 1) \
{ insert(begin() + uiIndex, nInsert, lItem); } \
void Remove(T lItem); \
@@ -170,7 +170,7 @@ protected: \
int Index(T lItem, CMPFUNC fnCompare) const; \
size_t IndexForInsert(T lItem, CMPFUNC fnCompare) const; \
void Add(T lItem, size_t nInsert = 1); \
- void Add(T lItem, CMPFUNC fnCompare); \
+ size_t Add(T lItem, CMPFUNC fnCompare); \
void Insert(T lItem, size_t uiIndex, size_t nInsert = 1); \
void Remove(T lItem); \
void RemoveAt(size_t uiIndex, size_t nRemove = 1); \
@@ -350,10 +350,16 @@ public: \
typedef value_type& reference; \
typedef value_type* pointer; \
typedef reverse_iterator itor; \
- friend itor operator+(int o, const itor& it); \
- friend itor operator+(const itor& it, int o); \
- friend itor operator-(const itor& it, int o); \
- friend difference_type operator -(const itor& i1, const itor& i2);\
+ friend inline itor operator+(int o, const itor& it) \
+ { return it.m_ptr - o; } \
+ friend inline itor operator+(const itor& it, int o) \
+ { return it.m_ptr - o; } \
+ friend inline itor operator-(const itor& it, int o) \
+ { return it.m_ptr + o; } \
+ friend inline difference_type operator-(const itor& i1, \
+ const itor& i2) \
+ { return i1.m_ptr - i2.m_ptr; } \
+ \
public: \
pointer m_ptr; \
reverse_iterator() : m_ptr(NULL) { } \
@@ -376,10 +382,16 @@ public: \
typedef const value_type& reference; \
typedef const value_type* pointer; \
typedef const_reverse_iterator itor; \
- friend itor operator+(int o, const itor& it); \
- friend itor operator+(const itor& it, int o); \
- friend itor operator-(const itor& it, int o); \
- friend difference_type operator -(const itor& i1, const itor& i2);\
+ friend inline itor operator+(int o, const itor& it) \
+ { return it.m_ptr - o; } \
+ friend inline itor operator+(const itor& it, int o) \
+ { return it.m_ptr - o; } \
+ friend inline itor operator-(const itor& it, int o) \
+ { return it.m_ptr + o; } \
+ friend inline difference_type operator-(const itor& i1, \
+ const itor& i2) \
+ { return i1.m_ptr - i2.m_ptr; } \
+ \
public: \
pointer m_ptr; \
const_reverse_iterator() : m_ptr(NULL) { } \
@@ -434,21 +446,8 @@ public: \
void reserve(size_type n) { base::reserve(n); }; \
void resize(size_type n, value_type v = value_type()); \
size_type size() const { return base::size(); } \
-}; \
- \
-inline name::reverse_iterator operator+(int o, const name::reverse_iterator& it) { return it.m_ptr - o; } \
-inline name::reverse_iterator operator+(const name::reverse_iterator& it, int o) { return it.m_ptr - o; } \
-inline name::reverse_iterator operator-(const name::reverse_iterator& it, int o) { return it.m_ptr + o; } \
-inline name::difference_type operator -(const name::reverse_iterator& i1, \
- const name::reverse_iterator& i2) \
- { return i1.m_ptr - i2.m_ptr; } \
- \
-inline name::const_reverse_iterator operator+(int o, const name::const_reverse_iterator& it) { return it.m_ptr - o; } \
-inline name::const_reverse_iterator operator+(const name::const_reverse_iterator& it, int o) { return it.m_ptr - o; } \
-inline name::const_reverse_iterator operator-(const name::const_reverse_iterator& it, int o) { return it.m_ptr + o; } \
-inline name::difference_type operator -(const name::const_reverse_iterator& i1,\
- const name::const_reverse_iterator& i2) \
- { return i1.m_ptr - i2.m_ptr; } \
+}
+
#endif // !wxUSE_STL
@@ -488,8 +487,8 @@ public: \
void AddAt(T item, size_t index) \
{ base::insert(begin() + index, item); } \
\
- void Add(T Item) \
- { base::Add(Item, (CMPFUNC)m_fnCompare); } \
+ size_t Add(T Item) \
+ { return base::Add(Item, (CMPFUNC)m_fnCompare); } \
\
void RemoveAt(size_t uiIndex, size_t nRemove = 1) \
{ base::erase(begin() + uiIndex, begin() + uiIndex + nRemove); } \