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

use wxSwap()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-09-15 16:13:06 +00:00
parent dac8712fcf
commit 1372f8ccd0
3 changed files with 31 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/wx/arrstr.h
View File

@@ -303,22 +303,10 @@ public:
size_type size() const { return GetCount(); }
void swap(wxArrayString& other)
{
// not sure if we can rely on having std::swap() everywhere so do it
// manually
const size_t savedSize = m_nSize;
const size_t savedCount = m_nCount;
wxString * const savedItems = m_pItems;
const bool savedAutoSort = m_autoSort;
m_nSize = other.m_nSize;
m_nCount = other.m_nCount;
m_pItems = other.m_pItems;
m_autoSort = other.m_autoSort;
other.m_nSize = savedSize;
other.m_nCount = savedCount;
other.m_pItems = savedItems;
other.m_autoSort = savedAutoSort;
wxSwap(m_nSize, other.m_nSize);
wxSwap(m_nCount, other.m_nCount);
wxSwap(m_pItems, other.m_pItems);
wxSwap(m_autoSort, other.m_autoSort);
}
protected:

14
include/wx/dynarray.h
View File

@@ -284,17 +284,9 @@ protected: \
\
void swap(name& other) \
{ \
const size_t savedSize = m_nSize; \
const size_t savedCount = m_nCount; \
T * const savedItems = m_pItems; \
\
m_nSize = other.m_nSize; \
m_nCount = other.m_nCount; \
m_pItems = other.m_pItems; \
\
other.m_nSize = savedSize; \
other.m_nCount = savedCount; \
other.m_pItems = savedItems; \
wxSwap(m_nSize, other.m_nSize); \
wxSwap(m_nCount, other.m_nCount); \
wxSwap(m_pItems, other.m_pItems); \
} \
\
/* the following functions may be made directly public because */ \