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

DeleteFunction argument should be non-const since it

Browse Source 
is deleted inside the function.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37272 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2006-02-03 18:26:55 +00:00
parent f219764488
commit 1794103bab
3 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/list.h
View File

@@ -135,13 +135,6 @@ private:
#endif // defined( __VISUALC__ ) #endif // defined( __VISUALC__ )
// Visual C++ 2005 complains about the const
#if (defined(__VISUALC__) && __VISUALC__ >= 1400) || defined(__MWERKS__)
#define _WX_DELETEFUNCTIONCONST
#else
#define _WX_DELETEFUNCTIONCONST const
#endif
#define WX_DECLARE_LIST_XO(elT, liT, decl) \ #define WX_DECLARE_LIST_XO(elT, liT, decl) \
VC6_WORKAROUND(elT, liT, decl) \ VC6_WORKAROUND(elT, liT, decl) \
decl liT : public std::list<elT> \ decl liT : public std::list<elT> \
@@ -150,7 +143,7 @@ private:
bool m_destroy; \ bool m_destroy; \
private: \ private: \
typedef elT _WX_LIST_ITEM_TYPE_##liT; \ typedef elT _WX_LIST_ITEM_TYPE_##liT; \
static void DeleteFunction( _WX_DELETEFUNCTIONCONST _WX_LIST_ITEM_TYPE_##liT X ); \ static void DeleteFunction( _WX_LIST_ITEM_TYPE_##liT X ); \
public: \ public: \
class compatibility_iterator \ class compatibility_iterator \
{ \ { \

2
include/wx/listimpl.cpp
View File

@@ -13,7 +13,7 @@
#undef WX_DEFINE_LIST #undef WX_DEFINE_LIST
#define WX_DEFINE_LIST(name) \ #define WX_DEFINE_LIST(name) \
void name::DeleteFunction( _WX_DELETEFUNCTIONCONST _WX_LIST_ITEM_TYPE_##name X ) \ void name::DeleteFunction( _WX_LIST_ITEM_TYPE_##name X ) \
{ \ { \
delete X; \ delete X; \
} }

2
src/common/list.cpp
View File

@@ -758,7 +758,7 @@ wxNode *wxStringList::Prepend(const wxChar *s)
WX_DEFINE_LIST(wxObjectList) WX_DEFINE_LIST(wxObjectList)
// with wxUSE_STL wxStringList contains wxString objects, not pointers // with wxUSE_STL wxStringList contains wxString objects, not pointers
void wxStringListBase::DeleteFunction( _WX_DELETEFUNCTIONCONST wxString WXUNUSED(X) ) void wxStringListBase::DeleteFunction( wxString WXUNUSED(X) )
{ {
} }