reverted last commit, still broken for VC6

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30364 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h
index b24d807b9c74607c4bfc75df5b5cf69edf187591..0f1751ade0be029db1b67029ea75b8ed2d09db9d 100644 (file)
--- a/include/wx/dynarray.h
+++ b/include/wx/dynarray.h
@@ -320,8 +320,9 @@ public:                                                               \
 // common declaration used by both _WX_DEFINE_TYPEARRAY and
 // _WX_DEFINE_TYPEARRAY_PTR
 #define  _WX_DEFINE_TYPEARRAY_HELPER(T, name, base, classexp, ptrop)  \
 // 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_ASSERT(sizeof(T) <= sizeof(base::base_type),           \
-                       TypeTooBigToBeStoredIn##base);                 \
+wxCOMPILE_TIME_ASSERT2(sizeof(T) <= sizeof(base::base_type),          \
+                       TypeTooBigToBeStoredIn##base,                  \
+                       name);                                         \

 typedef int (CMPFUNC_CONV *CMPFUNC##T)(T *pItem1, T *pItem2);         \
 classexp name : public base                                           \
 {                                                                     \
 typedef int (CMPFUNC_CONV *CMPFUNC##T)(T *pItem1, T *pItem2);         \
 classexp name : public base                                           \
 {                                                                     \


@@ -495,8 +496,9 @@ 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_ASSERT(sizeof(T) <= sizeof(base::base_type),           \
-                      TypeTooBigToBeStoredInSorted##base);            \
+wxCOMPILE_TIME_ASSERT2(sizeof(T) <= sizeof(base::base_type),          \
+                       TypeTooBigToBeStoredInSorted##base,            \
+                       name);                                         \

 classexp name : public base                                           \
 {                                                                     \
   typedef comptype SCMPFUNC;                                          \
 classexp name : public base                                           \
 {                                                                     \
   typedef comptype SCMPFUNC;                                          \