AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Applied patch [ 1392288 ] FIX: Bug 1306671 Build Error in list.h with VC2005

Browse Source 
By Kevin J Bluck, with mods by JS


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36937 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2006-01-17 19:02:39 +00:00
parent bcfa2b3184
commit 2ad75f457d
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/list.h
View File

@ -135,6 +135,13 @@ private:
#endif // defined( __VISUALC__ ) #endif // defined( __VISUALC__ )
// Visual C++ 2005 complains about the const
#if defined(__VISUALC__) && __VISUALC__ >= 1400
#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> \
@ -143,7 +150,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( const _WX_LIST_ITEM_TYPE_##liT X ); \ static void DeleteFunction( _WX_DELETEFUNCTIONCONST _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( const _WX_LIST_ITEM_TYPE_##name X ) \ void name::DeleteFunction( _WX_DELETEFUNCTIONCONST _WX_LIST_ITEM_TYPE_##name X ) \
{ \ { \
delete X; \ delete X; \
} }