From 9ba4b498e306119b4aa0361e45165e4d639815e3 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 7 Jun 2005 18:55:49 +0000 Subject: [PATCH] VC6 (harmless) warning fix git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34580 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/ownerdrw.cpp | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp index 380a2fe5c6..8cf2357171 100644 --- a/src/msw/ownerdrw.cpp +++ b/src/msw/ownerdrw.cpp @@ -103,9 +103,28 @@ IMPLEMENT_DYNAMIC_CLASS(wxMSWSystemMenuFontModule, wxModule) #pragma warning "TODO: remove gs_menuItems hack" #endif +// VC++ 6 gives a warning here: +// +// return type for 'OwnerDrawnSet_wxImplementation_HashTable::iterator:: +// operator ->' is 'class wxOwnerDrawn ** ' (ie; not a UDT or reference to +// a UDT. Will produce errors if applied using infix notation. +// +// shut it down +#ifdef __VISUALC__ + #if __VISUALC__ <= 1300 + #pragma warning(push) + #pragma warning(disable: 4284) + #define POP_WARNINGS + #endif +#endif + #include "wx/hashset.h" WX_DECLARE_HASH_SET(wxOwnerDrawn*, wxPointerHash, wxPointerEqual, OwnerDrawnSet); +#ifdef POP_WARNINGS + #pragma warning(pop) +#endif + static OwnerDrawnSet gs_menuItems; // ============================================================================ -- 2.47.2