From a4c1cdc9dc89b4479041fa9a18cd820115560ba5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sat, 14 Apr 2007 11:04:30 +0000 Subject: [PATCH] don't use the VC6 workaround in wxList with newer versions of VC git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45453 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 ad0e88f93d..289d762b58 100644 --- a/include/wx/list.h +++ b/include/wx/list.h @@ -93,7 +93,7 @@ enum wxKeyType #define WX_DECLARE_LIST_WITH_DECL(elT, liT, decl) \ WX_DECLARE_LIST_XO(elT*, liT, decl) -#if !defined( __VISUALC__ ) +#if !defined(__VISUALC__) || __VISUALC__ >= 1300 // == !VC6 template class WXDLLIMPEXP_BASE wxList_SortFunction @@ -109,7 +109,7 @@ private: #define WX_LIST_SORTFUNCTION( elT, f ) wxList_SortFunction(f) #define VC6_WORKAROUND(elT, liT, decl) -#else // if defined( __VISUALC__ ) +#else // if defined( __VISUALC__ ) && __VISUALC__ < 1300 // == VC6 #define WX_LIST_SORTFUNCTION( elT, f ) std::greater( f ) #define VC6_WORKAROUND(elT, liT, decl) \ @@ -133,7 +133,7 @@ private: } \ }; -#endif // defined( __VISUALC__ ) +#endif // VC6/!VC6 /* Note 1: the outer helper class _WX_LIST_HELPER_##liT below is a workaround -- 2.45.2