From edad629344156bc9274a1af372f91d05d54ca297 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 20 Oct 2004 00:34:40 +0000 Subject: [PATCH] don't use wxCOMPILE_TIME_ASSERT2, wxCOMPILE_TIME_ASSERT works for VC++ too now git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30027 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/dynarray.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h index 0f1751ade0..b24d807b9c 100644 --- a/include/wx/dynarray.h +++ b/include/wx/dynarray.h @@ -320,9 +320,8 @@ public: \ // common declaration used by both _WX_DEFINE_TYPEARRAY and // _WX_DEFINE_TYPEARRAY_PTR #define _WX_DEFINE_TYPEARRAY_HELPER(T, name, base, classexp, ptrop) \ -wxCOMPILE_TIME_ASSERT2(sizeof(T) <= sizeof(base::base_type), \ - TypeTooBigToBeStoredIn##base, \ - name); \ +wxCOMPILE_TIME_ASSERT(sizeof(T) <= sizeof(base::base_type), \ + TypeTooBigToBeStoredIn##base); \ typedef int (CMPFUNC_CONV *CMPFUNC##T)(T *pItem1, T *pItem2); \ classexp name : public base \ { \ @@ -496,9 +495,8 @@ public: \ // ---------------------------------------------------------------------------- #define _WX_DEFINE_SORTED_TYPEARRAY_2(T, name, base, defcomp, classexp, comptype)\ -wxCOMPILE_TIME_ASSERT2(sizeof(T) <= sizeof(base::base_type), \ - TypeTooBigToBeStoredInSorted##base, \ - name); \ +wxCOMPILE_TIME_ASSERT(sizeof(T) <= sizeof(base::base_type), \ + TypeTooBigToBeStoredInSorted##base); \ classexp name : public base \ { \ typedef comptype SCMPFUNC; \ -- 2.45.2