X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/576adedbc01b335f921aaa3254ff805a07ef12f3..a4f6fe43c33bd7933645d110ad2719871dab043d:/include/wx/listimpl.cpp?ds=sidebyside diff --git a/include/wx/listimpl.cpp b/include/wx/listimpl.cpp index 1027f4eaab..d9a4ffadf2 100644 --- a/include/wx/listimpl.cpp +++ b/include/wx/listimpl.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: listimpl.cpp +// Name: wx/listimpl.cpp // Purpose: second-part of macro based implementation of template lists // Author: Vadim Zeitlin // Modified by: @@ -9,7 +9,7 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if wxUSE_STL +#if wxUSE_STD_CONTAINERS #undef WX_DEFINE_LIST #define WX_DEFINE_LIST(name) \ @@ -17,9 +17,9 @@ { \ delete X; \ } \ - name::BaseListType name::EmptyList; + _WX_LIST_HELPER_##name::BaseListType _WX_LIST_HELPER_##name::EmptyList; -#else // !wxUSE_STL +#else // !wxUSE_STD_CONTAINERS #undef WX_DEFINE_LIST_2 #define WX_DEFINE_LIST_2(T, name) \ void wx##name##Node::DeleteData() \ @@ -32,5 +32,5 @@ #undef WX_DEFINE_LIST #define WX_DEFINE_LIST(name) WX_DEFINE_LIST_2(_WX_LIST_ITEM_TYPE_##name, name) -#endif // wxUSE_STL/!wxUSE_STL +#endif // wxUSE_STD_CONTAINERS/!wxUSE_STD_CONTAINERS