X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c0089c96ecb12ae0ad48545337d2e47ce3a9f37a..09e28f7f8d30588bb94f9f8c4c974830f7e377e2:/include/wx/list.h diff --git a/include/wx/list.h b/include/wx/list.h index fb597e90aa..a83cff4166 100644 --- a/include/wx/list.h +++ b/include/wx/list.h @@ -135,6 +135,13 @@ private: #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) \ VC6_WORKAROUND(elT, liT, decl) \ decl liT : public std::list \ @@ -143,7 +150,7 @@ private: bool m_destroy; \ private: \ 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: \ class compatibility_iterator \ { \