From 8a2a5a449eeedc95cbd88d5638516c98a5e92a6c Mon Sep 17 00:00:00 2001 From: Michael Wetherell Date: Tue, 18 Sep 2007 21:49:27 +0000 Subject: [PATCH] template class WXDLLIMPEXP_FWD_XRC wxVector; instantiates as well as forward declares, which gives us multiple definition link errors on some systems. So trying WXDLLIMPEXP_FWD_XRC on the declaration of m_handlers instead. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48775 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/xrc/xmlres.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/include/wx/xrc/xmlres.h b/include/wx/xrc/xmlres.h index b2a2d2f3bc..efaba14f72 100644 --- a/include/wx/xrc/xmlres.h +++ b/include/wx/xrc/xmlres.h @@ -44,10 +44,6 @@ class wxXmlSubclassFactories; class wxXmlResourceModule; class wxXmlResourceDataRecords; -// make VC++ happy: otherwise it gives warnings when using this type for a -// member of DLL-exported wxXmlResource class in shared builds -template class WXDLLIMPEXP_FWD_XRC wxVector; - // These macros indicate current version of XML resources (this information is // encoded in root node of XRC file as "version" property). // @@ -277,7 +273,7 @@ private: long m_version; int m_flags; - wxVector m_handlers; + class WXDLLIMPEXP_FWD_XRC wxVector m_handlers; wxXmlResourceDataRecords *m_data; #if wxUSE_FILESYSTEM wxFileSystem m_curFileSystem; -- 2.45.2