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

More MSVC fixes .

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2003-07-08 22:52:30 +00:00
parent 44c2d8d0f3
commit 3e49e57746
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/wx/dynarray.h
View File

@@ -457,10 +457,6 @@ inline name::difference_type operator -(const name::const_reverse_iterator& i1,\
// cannot handle types with size greater than pointer because of sorting // cannot handle types with size greater than pointer because of sorting
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#define _WX_DEFINE_SORTED_TYPEARRAY(T, name, base, defcomp, classexp) \
typedef int (CMPFUNC_CONV *SCMPFUNC##T)(T pItem1, T pItem2); \
_WX_DEFINE_SORTED_TYPEARRAY_2(T, name, base, defcomp, classexp, SCMPFUNC##T)
#define _WX_DEFINE_SORTED_TYPEARRAY_2(T, name, base, defcomp, classexp, comptype)\ #define _WX_DEFINE_SORTED_TYPEARRAY_2(T, name, base, defcomp, classexp, comptype)\
wxCOMPILE_TIME_ASSERT2(sizeof(T) <= sizeof(void *), \ wxCOMPILE_TIME_ASSERT2(sizeof(T) <= sizeof(void *), \
TypeTooBigToBeStoredInSorted##base, \ TypeTooBigToBeStoredInSorted##base, \
@@ -660,8 +656,9 @@ private: \
#define WX_DEFINE_SORTED_USER_EXPORTED_TYPEARRAY(T, name, base, expmode) \ #define WX_DEFINE_SORTED_USER_EXPORTED_TYPEARRAY(T, name, base, expmode) \
typedef T _wxArray##name; \ typedef T _wxArray##name; \
_WX_DEFINE_SORTED_TYPEARRAY(_wxArray##name, name, base, \ typedef int (CMPFUNC_CONV *SCMPFUNC##name)(T pItem1, T pItem2); \
wxARRAY_EMPTY_CMP, class expmode) _WX_DEFINE_SORTED_TYPEARRAY_2(_wxArray##name, name, base, \
wxARRAY_EMPTY_CMP, class expmode, SCMPFUNC##name)
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// WX_DEFINE_SORTED_TYPEARRAY_CMP: exactly the same as above but the comparison // WX_DEFINE_SORTED_TYPEARRAY_CMP: exactly the same as above but the comparison
@@ -686,8 +683,9 @@ private: \
#define WX_DEFINE_SORTED_USER_EXPORTED_TYPEARRAY_CMP(T, cmpfunc, name, base, \ #define WX_DEFINE_SORTED_USER_EXPORTED_TYPEARRAY_CMP(T, cmpfunc, name, base, \
expmode) \ expmode) \
typedef T _wxArray##name; \ typedef T _wxArray##name; \
_WX_DEFINE_SORTED_TYPEARRAY(_wxArray##name, name, base, = cmpfunc, \ typedef int (CMPFUNC_CONV *SCMPFUNC##name)(T pItem1, T pItem2); \
class expmode) _WX_DEFINE_SORTED_TYPEARRAY_2(_wxArray##name, name, base, = cmpfunc, \
class expmode, SCMPFUNC##name)
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// WX_DECLARE_OBJARRAY(T, name): this macro generates a new array class // WX_DECLARE_OBJARRAY(T, name): this macro generates a new array class