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

don't use wxCOMPILE_TIME_ASSERT2, wxCOMPILE_TIME_ASSERT works for VC++ too now

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30027 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2004-10-20 00:34:40 +00:00
parent ce336c6d76
commit edad629344
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/dynarray.h
View File

@ -320,9 +320,8 @@ public: \
// common declaration used by both _WX_DEFINE_TYPEARRAY and // common declaration used by both _WX_DEFINE_TYPEARRAY and
// _WX_DEFINE_TYPEARRAY_PTR // _WX_DEFINE_TYPEARRAY_PTR
#define _WX_DEFINE_TYPEARRAY_HELPER(T, name, base, classexp, ptrop) \ #define _WX_DEFINE_TYPEARRAY_HELPER(T, name, base, classexp, ptrop) \
wxCOMPILE_TIME_ASSERT2(sizeof(T) <= sizeof(base::base_type), \ wxCOMPILE_TIME_ASSERT(sizeof(T) <= sizeof(base::base_type), \
TypeTooBigToBeStoredIn##base, \ TypeTooBigToBeStoredIn##base); \
name); \
typedef int (CMPFUNC_CONV *CMPFUNC##T)(T *pItem1, T *pItem2); \ typedef int (CMPFUNC_CONV *CMPFUNC##T)(T *pItem1, T *pItem2); \
classexp name : public base \ classexp name : public base \
{ \ { \
@ -496,9 +495,8 @@ public: \
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#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(base::base_type), \ wxCOMPILE_TIME_ASSERT(sizeof(T) <= sizeof(base::base_type), \
TypeTooBigToBeStoredInSorted##base, \ TypeTooBigToBeStoredInSorted##base); \
name); \
classexp name : public base \ classexp name : public base \
{ \ { \
typedef comptype SCMPFUNC; \ typedef comptype SCMPFUNC; \