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

Fixed compilation for GCC 3.4 when wxUSE_STL == 1.

Browse Source 
Should be compatible with VC6.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2005-03-13 17:08:43 +00:00
parent e126517457
commit 30bda36c48
1 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
include/wx/list.h
View File

@@ -98,27 +98,18 @@ 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)
template<class T>
class WXDLLIMPEXP_BASE wxList_SortFunction
{
public:
wxList_SortFunction(wxSortCompareFunction f) : m_f(f) { }
bool operator()(const T& i1, const T& i2)
{ return m_f((T*)&i1, (T*)&i2) < 0; }
private:
wxSortCompareFunction m_f;
};
#define WX_DECLARE_LIST_XO(elT, liT, decl) \ #define WX_DECLARE_LIST_XO(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 ); \
} \
}; \
\
decl liT : public std::list<elT> \ decl liT : public std::list<elT> \
{ \ { \
private: \ private: \
@@ -269,11 +260,9 @@ enum wxKeyType
std::for_each( begin(), end(), DeleteFunction ); \ std::for_each( begin(), end(), DeleteFunction ); \
clear(); \ clear(); \
} \ } \
\
/* 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( std::greater<elT>( compfunc ) ); } \ { sort( wxList_SortFunction<elT>( compfunc ) ); } \
\
~liT() { Clear(); } \ ~liT() { Clear(); } \
} }