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

VC6_WORKAROUND -> WX_LIST_VC6_WORKAROUND to prevent name conflicts

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-08-08 21:26:32 +00:00
parent 6f3f9b50aa
commit cae92a4988
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/list.h
View File

@@ -91,12 +91,12 @@ private:
}; };
#define WX_LIST_SORTFUNCTION( elT, f ) wxList_SortFunction<elT>(f) #define WX_LIST_SORTFUNCTION( elT, f ) wxList_SortFunction<elT>(f)
#define VC6_WORKAROUND(elT, liT, decl) #define WX_LIST_VC6_WORKAROUND(elT, liT, decl)
#else // if defined( __VISUALC__ ) && __VISUALC__ < 1300 // == VC6 #else // if defined( __VISUALC__ ) && __VISUALC__ < 1300 // == VC6
#define WX_LIST_SORTFUNCTION( elT, f ) std::greater<elT>( f ) #define WX_LIST_SORTFUNCTION( elT, f ) std::greater<elT>( f )
#define VC6_WORKAROUND(elT, liT, decl) \ #define WX_LIST_VC6_WORKAROUND(elT, liT, decl) \
decl liT; \ decl liT; \
\ \
/* Workaround for broken VC6 STL incorrectly requires a std::greater<> */ \ /* Workaround for broken VC6 STL incorrectly requires a std::greater<> */ \
@@ -164,7 +164,7 @@ inline const void *wxListCastElementToVoidPtr(const wxString& str)
static void DeleteFunction( _WX_LIST_ITEM_TYPE_##liT X ); \ static void DeleteFunction( _WX_LIST_ITEM_TYPE_##liT X ); \
}; \ }; \
\ \
VC6_WORKAROUND(elT, liT, decl) \ WX_LIST_VC6_WORKAROUND(elT, liT, decl) \
decl liT : public std::list<elT> \ decl liT : public std::list<elT> \
{ \ { \
private: \ private: \