From 335991afa513fee73e1def9824fa2d547686f659 Mon Sep 17 00:00:00 2001 From: Mattia Barbon Date: Sun, 13 Jul 2003 20:07:45 +0000 Subject: [PATCH] Move #inclusion of wx/msw/winundef.h for MinGW to afterstd.h. Fix WX_DEFINE_TYPEARRAY assert to refer to base array's elemnt type rather than to void*. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21935 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/afterstd.h | 3 +++ include/wx/dynarray.h | 5 +---- include/wx/list.h | 3 --- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/include/wx/afterstd.h b/include/wx/afterstd.h index 313c2257a2..a840f06f81 100644 --- a/include/wx/afterstd.h +++ b/include/wx/afterstd.h @@ -13,6 +13,9 @@ See the comments in beforestd.h. */ +#if defined(__WXMSW__) && defined(__MINGW32__) + #include "wx/msw/winundef.h" +#endif #ifdef _MSC_VER # pragma warning(pop) #endif diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h index 3228aee579..b836cffb72 100644 --- a/include/wx/dynarray.h +++ b/include/wx/dynarray.h @@ -24,9 +24,6 @@ #include #include #include "wx/afterstd.h" - #if defined(__WXMSW__) && defined(__MINGW32__) - #include "wx/msw/winundef.h" - #endif #endif /* @@ -457,7 +454,7 @@ public: \ // ---------------------------------------------------------------------------- #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(base::base_type), \ TypeTooBigToBeStoredInSorted##base, \ name); \ classexp name : public base \ diff --git a/include/wx/list.h b/include/wx/list.h index 43316ca914..ffddd09a58 100644 --- a/include/wx/list.h +++ b/include/wx/list.h @@ -42,9 +42,6 @@ #include "wx/beforestd.h" #include #include "wx/afterstd.h" - #if defined(__WXMSW__) && defined(__MINGW32__) - #include "wx/msw/winundef.h" - #endif #endif // ---------------------------------------------------------------------------- -- 2.45.2