From b85e0ae0a1b4be0c9c0514c706c586c5cb7df2e7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sun, 7 Oct 2007 17:15:37 +0000 Subject: [PATCH] globally disable VC++'s warning 4251 (non-exported member in dll-exported class and remove broken workaround trying to silence it git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49078 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/defs.h | 6 ++++++ include/wx/xrc/xmlres.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/include/wx/defs.h b/include/wx/defs.h index 65d3a8a726..838021c9c8 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -71,6 +71,12 @@ # pragma warning(disable:4512) /* operator=() couldn't be generated */ # pragma warning(disable:4710) /* function not inlined */ + /* There are too many false positivies for this one, particularly when + using templates like wxVector */ + /* class 'foo' needs to have dll-interface to be used by clients of + class 'bar'" */ +# pragma warning(disable:4251) + /* For VC++ 5.0 for release mode, the warning 'C4702: unreachable code */ /* is buggy, and occurs for code that does actually get executed */ # if !defined __WXDEBUG__ && __VISUALC__ <= 1100 diff --git a/include/wx/xrc/xmlres.h b/include/wx/xrc/xmlres.h index 877dc1237d..6146f5956f 100644 --- a/include/wx/xrc/xmlres.h +++ b/include/wx/xrc/xmlres.h @@ -273,7 +273,7 @@ private: long m_version; int m_flags; - class WXDLLIMPEXP_FWD_XRC wxVector m_handlers; + wxVector m_handlers; wxXmlResourceDataRecords *m_data; #if wxUSE_FILESYSTEM wxFileSystem m_curFileSystem; -- 2.45.2