X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a931653f856e08fec7aa1e455a5a13fad311eb2..bc55104d9ab0b0b835644f17a152b4fbbfa8c7b9:/include/wx/dynarray.h

diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h
index c0eee1dcdb..f70cc6c2f3 100644
--- a/include/wx/dynarray.h
+++ b/include/wx/dynarray.h
@@ -186,8 +186,9 @@ private:
 // ----------------------------------------------------------------------------
 
 #define  _WX_DEFINE_ARRAY(T, name, classexp)                        \
-wxCOMPILE_TIME_ASSERT(sizeof(T) <= sizeof(long),                    \
-                      TypeIsTooBigToBeStoredInWxArray);             \
+wxCOMPILE_TIME_ASSERT2(sizeof(T) <= sizeof(long),                   \
+                       TypeIsTooBigToBeStoredInWxArray,             \
+                       name);                                       \
 typedef int (CMPFUNC_CONV *CMPFUNC##T)(T *pItem1, T *pItem2);       \
 classexp name : public wxBaseArray                                  \
 {                                                                   \
@@ -230,8 +231,9 @@ public:                                                             \
 // ----------------------------------------------------------------------------
 
 #define _WX_DEFINE_SORTED_ARRAY(T, name, defcomp, classexp)         \
-wxCOMPILE_TIME_ASSERT(sizeof(T) <= sizeof(long),                    \
-                      TypeIsTooBigToBeStoredInWxArray);             \
+wxCOMPILE_TIME_ASSERT2(sizeof(T) <= sizeof(long),                   \
+                       TypeIsTooBigToBeStoredInWxArray,             \
+                       name);                                       \
 typedef int (CMPFUNC_CONV *SCMPFUNC##T)(T pItem1, T pItem2);        \
 classexp name : public wxBaseArray                                  \
 {                                                                   \
@@ -385,6 +387,8 @@ private:                                                            \
 // the normal arrays otherwise.
 // ----------------------------------------------------------------------------
 
+#define wxARRAY_EMPTY_CMP
+
 #define WX_DEFINE_SORTED_ARRAY(T, name)                         \
     WX_DEFINE_SORTED_USER_EXPORTED_ARRAY(T, name, wxARRAY_DEFAULT_EXPORT)
 
@@ -393,7 +397,7 @@ private:                                                            \
 
 #define WX_DEFINE_SORTED_USER_EXPORTED_ARRAY(T, name, expmode)  \
     typedef T _wxArray##name;                                   \
-    _WX_DEFINE_SORTED_ARRAY(_wxArray##name, name, /* */, class expmode)
+    _WX_DEFINE_SORTED_ARRAY(_wxArray##name, name, wxARRAY_EMPTY_CMP, class expmode)
 
 // ----------------------------------------------------------------------------
 // WX_DEFINE_SORTED_ARRAY_CMP: exactly the same as above but the comparison