Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't use template assign() with VC6, even though it can compile it it doesn't handle it correctly when using DLL

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59141 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-02-25 23:02:53 +00:00
parent a405cd89a2
commit 936525578d
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/wx/arrstr.h
View File

@@ -92,10 +92,14 @@ public:
#else // if !wxUSE_STL #else // if !wxUSE_STL
// this shouldn't be defined for compilers not supporting template methods or // this shouldn't be defined for compilers not supporting template methods or
// without std::distance() -- and if all of the currently supported compilers // without std::distance()
// do have it, then it can just be removed and wxHAS_VECTOR_TEMPLATE_ASSIGN //
// code always used // FIXME-VC6: currently it's only not defined for VC6 in DLL build as it
#define wxHAS_VECTOR_TEMPLATE_ASSIGN // doesn't export template methods from DLL correctly so even though
// it compiles them fine, we get link errors when using wxArrayString
#if !defined(__VISUALC6__) || !(defined(WXMAKINGDLL || defined(WXUSINGDLL)))
#define wxHAS_VECTOR_TEMPLATE_ASSIGN
#endif
#ifdef wxHAS_VECTOR_TEMPLATE_ASSIGN #ifdef wxHAS_VECTOR_TEMPLATE_ASSIGN
#include "wx/beforestd.h" #include "wx/beforestd.h"