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

workaround for mingw 3.2.3 DLL build with wxUSE_STL=1

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38292 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-03-23 02:01:25 +00:00
parent d294c9db88
commit 30a29593e8
3 changed files with 38 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
include/wx/list.h
View File

@@ -135,15 +135,42 @@ private:
#endif // defined( __VISUALC__ ) #endif // defined( __VISUALC__ )
/*
Note: the outer helper class _WX_LIST_HELPER_##liT below is a workaround
for mingw 3.2.3 compiler bug that prevents a static function of liT class
from being exported into dll. A minimal code snippet reproducing the bug:
struct WXDLLEXPORT Foo
{
static void Bar();
struct SomeInnerClass
{
friend class Foo; // comment this out to make it link
};
~Foo()
{
Bar();
}
};
The program does not link under mingw_gcc 3.2.3 producing undefined
reference to Foo::Bar() function
*/
// the real wxList-class declaration
#define WX_DECLARE_LIST_XO(elT, liT, decl) \ #define WX_DECLARE_LIST_XO(elT, liT, decl) \
class WXDLLEXPORT _WX_LIST_HELPER_##liT \
{ \
typedef elT _WX_LIST_ITEM_TYPE_##liT; \
public: \
static void DeleteFunction( _WX_LIST_ITEM_TYPE_##liT X ); \
}; \
\
VC6_WORKAROUND(elT, liT, decl) \ VC6_WORKAROUND(elT, liT, decl) \
decl liT : public std::list<elT> \ decl liT : public std::list<elT> \
{ \ { \
private: \ private: \
bool m_destroy; \ bool m_destroy; \
private: \
typedef elT _WX_LIST_ITEM_TYPE_##liT; \
static void DeleteFunction( _WX_LIST_ITEM_TYPE_##liT X ); \
public: \ public: \
decl compatibility_iterator \ decl compatibility_iterator \
{ \ { \
@@ -269,7 +296,7 @@ private:
void Erase( const compatibility_iterator& i ) \ void Erase( const compatibility_iterator& i ) \
{ \ { \
if ( m_destroy ) \ if ( m_destroy ) \
DeleteFunction( i->GetData() ); \ _WX_LIST_HELPER_##liT::DeleteFunction( i->GetData() ); \
erase( i.m_iter ); \ erase( i.m_iter ); \
} \ } \
bool DeleteNode( const compatibility_iterator& i ) \ bool DeleteNode( const compatibility_iterator& i ) \
@@ -288,7 +315,8 @@ private:
void Clear() \ void Clear() \
{ \ { \
if ( m_destroy ) \ if ( m_destroy ) \
std::for_each( begin(), end(), DeleteFunction ); \ std::for_each( begin(), end(), \
_WX_LIST_HELPER_##liT::DeleteFunction ); \
clear(); \ clear(); \
} \ } \
/* Workaround for broken VC6 std::list::sort() see above */ \ /* Workaround for broken VC6 std::list::sort() see above */ \

8
include/wx/listimpl.cpp
View File

@@ -12,10 +12,10 @@
#if wxUSE_STL #if wxUSE_STL
#undef WX_DEFINE_LIST #undef WX_DEFINE_LIST
#define WX_DEFINE_LIST(name) \ #define WX_DEFINE_LIST(name) \
void name::DeleteFunction( _WX_LIST_ITEM_TYPE_##name X ) \ void _WX_LIST_HELPER_##name::DeleteFunction( _WX_LIST_ITEM_TYPE_##name X ) \
{ \ { \
delete X; \ delete X; \
} }
#else // if !wxUSE_STL #else // if !wxUSE_STL

2
src/common/list.cpp
View File

@@ -760,7 +760,7 @@ wxNode *wxStringList::Prepend(const wxChar *s)
WX_DEFINE_LIST(wxObjectList) WX_DEFINE_LIST(wxObjectList)
// with wxUSE_STL wxStringList contains wxString objects, not pointers // with wxUSE_STL wxStringList contains wxString objects, not pointers
void wxStringListBase::DeleteFunction( wxString WXUNUSED(X) ) void _WX_LIST_HELPER_wxStringListBase::DeleteFunction( wxString WXUNUSED(X) )
{ {
} }