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

Blind fix for VC6 compilation when wxUSE_STL == 1.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2005-03-14 21:52:57 +00:00
parent 1e1ef90060
commit 168da56b8f
1 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
include/wx/list.h
View File

@@ -98,6 +98,8 @@ enum wxKeyType
#define WX_DECLARE_LIST_WITH_DECL(elT, liT, decl) \ #define WX_DECLARE_LIST_WITH_DECL(elT, liT, decl) \
WX_DECLARE_LIST_XO(elT*, liT, decl) WX_DECLARE_LIST_XO(elT*, liT, decl)
#if !defined( __VISUALC__ )
template<class T> template<class T>
class WXDLLIMPEXP_BASE wxList_SortFunction class WXDLLIMPEXP_BASE wxList_SortFunction
{ {
@@ -109,7 +111,37 @@ private:
wxSortCompareFunction m_f; wxSortCompareFunction m_f;
}; };
#define WX_LIST_SORTFUNCTION( elT, f ) wxList_SortFunction<elT>(f)
#define VC6_WORKAROUND(elT, liT, decl)
#else // if defined( __VISUALC__ )
#define WX_LIST_SORTFUNCTION( elT, f ) std::greater<elT>( f ) )
#define VC6_WORKAROUND(elT, liT, decl) \
decl liT; \
\
/* Workaround for broken VC6 STL incorrectly requires a std::greater<> */ \
/* to be passed into std::list::sort() */ \
template <> \
struct std::greater<elT> \
{ \
private: \
wxSortCompareFunction m_CompFunc; \
public: \
greater( wxSortCompareFunction compfunc = NULL ) \
: m_CompFunc( compfunc ) {} \
bool operator()(const elT X, const elT Y) const \
{ \
return m_CompFunc ? \
( m_CompFunc( X, Y ) < 0 ) : \
( X > Y ); \
} \
};
#endif // defined( __VISUALC__ )
#define WX_DECLARE_LIST_XO(elT, liT, decl) \ #define WX_DECLARE_LIST_XO(elT, liT, decl) \
VC6_WORKAROUND(elT, liT, decl) \
decl liT : public std::list<elT> \ decl liT : public std::list<elT> \
{ \ { \
private: \ private: \
@@ -262,7 +294,7 @@ private:
} \ } \
/* Workaround for broken VC6 std::list::sort() see above */ \ /* Workaround for broken VC6 std::list::sort() see above */ \
void Sort( wxSortCompareFunction compfunc ) \ void Sort( wxSortCompareFunction compfunc ) \
{ sort( wxList_SortFunction<elT>( compfunc ) ); } \ { sort( WX_LIST_SORTFUNCTION( elT, compfunc ) ); } \
~liT() { Clear(); } \ ~liT() { Clear(); } \
} }