X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/edad629344156bc9274a1af372f91d05d54ca297..20bc5ad8dd419d0d3e524079f8fdbe3d8c14231f:/include/wx/dynarray.h diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h index b24d807b9c..b6ff097b04 100644 --- a/include/wx/dynarray.h +++ b/include/wx/dynarray.h @@ -296,15 +296,15 @@ public: \ int Index(T e, bool bFromEnd = false) const \ { return base::Index(e, bFromEnd); } \ \ - void Add(T Item, size_t nInsert = 1) \ - { insert(end(), nInsert, Item); } \ - void Insert(T Item, size_t uiIndex, size_t nInsert = 1) \ - { insert(begin() + uiIndex, nInsert, Item); } \ + void Add(T lItem, size_t nInsert = 1) \ + { insert(end(), nInsert, lItem); } \ + void Insert(T lItem, size_t uiIndex, size_t nInsert = 1) \ + { insert(begin() + uiIndex, nInsert, lItem); } \ \ void RemoveAt(size_t uiIndex, size_t nRemove = 1) \ { base::RemoveAt(uiIndex, nRemove); } \ - void Remove(T Item) \ - { int iIndex = Index(Item); \ + void Remove(T lItem) \ + { int iIndex = Index(lItem); \ wxCHECK2_MSG( iIndex != wxNOT_FOUND, return, \ _WX_ERROR_REMOVE); \ RemoveAt((size_t)iIndex); } \ @@ -320,8 +320,9 @@ public: \ // common declaration used by both _WX_DEFINE_TYPEARRAY and // _WX_DEFINE_TYPEARRAY_PTR #define _WX_DEFINE_TYPEARRAY_HELPER(T, name, base, classexp, ptrop) \ -wxCOMPILE_TIME_ASSERT(sizeof(T) <= sizeof(base::base_type), \ - TypeTooBigToBeStoredIn##base); \ +wxCOMPILE_TIME_ASSERT2(sizeof(T) <= sizeof(base::base_type), \ + TypeTooBigToBeStoredIn##base, \ + name); \ typedef int (CMPFUNC_CONV *CMPFUNC##T)(T *pItem1, T *pItem2); \ classexp name : public base \ { \ @@ -341,18 +342,18 @@ public: \ T& Last() const \ { return (T&)(base::operator[](Count() - 1)); } \ \ - int Index(T Item, bool bFromEnd = false) const \ - { return base::Index((base_type)Item, bFromEnd); } \ + int Index(T lItem, bool bFromEnd = false) const \ + { return base::Index((base_type)lItem, bFromEnd); } \ \ - void Add(T Item, size_t nInsert = 1) \ - { base::Add((base_type)Item, nInsert); } \ - void Insert(T Item, size_t uiIndex, size_t nInsert = 1) \ - { base::Insert((base_type)Item, uiIndex, nInsert) ; } \ + void Add(T lItem, size_t nInsert = 1) \ + { base::Add((base_type)lItem, nInsert); } \ + void Insert(T lItem, size_t uiIndex, size_t nInsert = 1) \ + { base::Insert((base_type)lItem, uiIndex, nInsert) ; } \ \ void RemoveAt(size_t uiIndex, size_t nRemove = 1) \ { base::RemoveAt(uiIndex, nRemove); } \ - void Remove(T Item) \ - { int iIndex = Index(Item); \ + void Remove(T lItem) \ + { int iIndex = Index(lItem); \ wxCHECK2_MSG( iIndex != wxNOT_FOUND, return, \ _WX_ERROR_REMOVE); \ base::RemoveAt((size_t)iIndex); } \ @@ -399,11 +400,11 @@ public: \ reverse_iterator(const itor& it) : m_ptr(it.m_ptr) { } \ reference operator*() const { return *m_ptr; } \ ptrop \ - itor operator++() { --m_ptr; return *this; } \ - itor operator++(int) \ + itor& operator++() { --m_ptr; return *this; } \ + const itor operator++(int) \ { reverse_iterator tmp = *this; --m_ptr; return tmp; } \ - itor operator--() { ++m_ptr; return *this; } \ - itor operator--(int) { itor tmp = *this; ++m_ptr; return tmp; } \ + itor& operator--() { ++m_ptr; return *this; } \ + const itor operator--(int) { itor tmp = *this; ++m_ptr; return tmp; }\ bool operator ==(const itor& it) { return m_ptr == it.m_ptr; } \ bool operator !=(const itor& it) { return m_ptr != it.m_ptr; } \ }; \ @@ -432,11 +433,11 @@ public: \ const_reverse_iterator(const reverse_iterator& it) : m_ptr(it.m_ptr) { }\ reference operator*() const { return *m_ptr; } \ ptrop \ - itor operator++() { --m_ptr; return *this; } \ - itor operator++(int) \ + itor& operator++() { --m_ptr; return *this; } \ + const itor operator++(int) \ { itor tmp = *this; --m_ptr; return tmp; } \ - itor operator--() { ++m_ptr; return *this; } \ - itor operator--(int) { itor tmp = *this; ++m_ptr; return tmp; } \ + itor& operator--() { ++m_ptr; return *this; } \ + const itor operator--(int) { itor tmp = *this; ++m_ptr; return tmp; }\ bool operator ==(const itor& it) { return m_ptr == it.m_ptr; } \ bool operator !=(const itor& it) { return m_ptr != it.m_ptr; } \ }; \ @@ -495,8 +496,9 @@ public: \ // ---------------------------------------------------------------------------- #define _WX_DEFINE_SORTED_TYPEARRAY_2(T, name, base, defcomp, classexp, comptype)\ -wxCOMPILE_TIME_ASSERT(sizeof(T) <= sizeof(base::base_type), \ - TypeTooBigToBeStoredInSorted##base); \ +wxCOMPILE_TIME_ASSERT2(sizeof(T) <= sizeof(base::base_type), \ + TypeTooBigToBeStoredInSorted##base, \ + name); \ classexp name : public base \ { \ typedef comptype SCMPFUNC; \ @@ -516,22 +518,22 @@ public: \ T& Last() const \ { return (T&)(base::operator[](size() - 1)); } \ \ - int Index(T Item) const \ - { return base::Index(Item, (CMPFUNC)m_fnCompare); } \ + int Index(T lItem) const \ + { return base::Index(lItem, (CMPFUNC)m_fnCompare); } \ \ - size_t IndexForInsert(T Item) const \ - { return base::IndexForInsert(Item, (CMPFUNC)m_fnCompare); } \ + size_t IndexForInsert(T lItem) const \ + { return base::IndexForInsert(lItem, (CMPFUNC)m_fnCompare); } \ \ void AddAt(T item, size_t index) \ { base::insert(begin() + index, item); } \ \ - size_t Add(T Item) \ - { return base::Add(Item, (CMPFUNC)m_fnCompare); } \ + size_t Add(T lItem) \ + { return base::Add(lItem, (CMPFUNC)m_fnCompare); } \ \ void RemoveAt(size_t uiIndex, size_t nRemove = 1) \ { base::erase(begin() + uiIndex, begin() + uiIndex + nRemove); } \ - void Remove(T Item) \ - { int iIndex = Index(Item); \ + void Remove(T lItem) \ + { int iIndex = Index(lItem); \ wxCHECK2_MSG( iIndex != wxNOT_FOUND, return, \ _WX_ERROR_REMOVE ); \ base::erase(begin() + iIndex); } \ @@ -573,17 +575,17 @@ public: \ T& Last() const \ { return *(T*)(base::operator[](size() - 1)); } \ \ - int Index(const T& Item, bool bFromEnd = false) const; \ + int Index(const T& lItem, bool bFromEnd = false) const; \ \ - void Add(const T& Item, size_t nInsert = 1); \ + void Add(const T& lItem, size_t nInsert = 1); \ void Add(const T* pItem) \ { base::push_back((T*)pItem); } \ void push_back(const T* pItem) \ { base::push_back((T*)pItem); } \ - void push_back(const T& Item) \ - { Add(Item); } \ + void push_back(const T& lItem) \ + { Add(lItem); } \ \ - void Insert(const T& Item, size_t uiIndex, size_t nInsert = 1); \ + void Insert(const T& lItem, size_t uiIndex, size_t nInsert = 1); \ void Insert(const T* pItem, size_t uiIndex) \ { base::insert(begin() + uiIndex, (T*)pItem); } \ \