From cae92a498867292d78d7191120b5d379091e86cb Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Wed, 8 Aug 2007 21:26:32 +0000 Subject: [PATCH] VC6_WORKAROUND -> WX_LIST_VC6_WORKAROUND to prevent name conflicts git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/list.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/wx/list.h b/include/wx/list.h index 0694f7efeb..c9c679d24a 100644 --- a/include/wx/list.h +++ b/include/wx/list.h @@ -91,12 +91,12 @@ private: }; #define WX_LIST_SORTFUNCTION( elT, f ) wxList_SortFunction(f) -#define VC6_WORKAROUND(elT, liT, decl) +#define WX_LIST_VC6_WORKAROUND(elT, liT, decl) #else // if defined( __VISUALC__ ) && __VISUALC__ < 1300 // == VC6 #define WX_LIST_SORTFUNCTION( elT, f ) std::greater( f ) -#define VC6_WORKAROUND(elT, liT, decl) \ +#define WX_LIST_VC6_WORKAROUND(elT, liT, decl) \ decl liT; \ \ /* 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 ); \ }; \ \ - VC6_WORKAROUND(elT, liT, decl) \ + WX_LIST_VC6_WORKAROUND(elT, liT, decl) \ decl liT : public std::list \ { \ private: \ -- 2.45.2