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

undefine _DEFINE_LIST before redefining it; also rename it to have WX prefix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49277 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2007-10-20 22:02:08 +00:00
parent fe1efe6ab7
commit 576adedbc0
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/listimpl.cpp
View File

@ -20,8 +20,8 @@
name::BaseListType name::EmptyList; name::BaseListType name::EmptyList;
#else // !wxUSE_STL #else // !wxUSE_STL
#undef WX_DEFINE_LIST_2
#define _DEFINE_LIST(T, name) \ #define WX_DEFINE_LIST_2(T, name) \
void wx##name##Node::DeleteData() \ void wx##name##Node::DeleteData() \
{ \ { \
delete (T *)GetData(); \ delete (T *)GetData(); \
@ -30,10 +30,7 @@
// redefine the macro so that now it will generate the class implementation // redefine the macro so that now it will generate the class implementation
// old value would provoke a compile-time error if this file is not included // old value would provoke a compile-time error if this file is not included
#undef WX_DEFINE_LIST #undef WX_DEFINE_LIST
#define WX_DEFINE_LIST(name) _DEFINE_LIST(_WX_LIST_ITEM_TYPE_##name, name) #define WX_DEFINE_LIST(name) WX_DEFINE_LIST_2(_WX_LIST_ITEM_TYPE_##name, name)
// don't pollute preprocessor's name space
//#undef _DEFINE_LIST
#endif // wxUSE_STL/!wxUSE_STL #endif // wxUSE_STL/!wxUSE_STL