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

fix for gcc bug under Mac OS X

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9059 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-01-06 14:31:35 +00:00
parent 421db2ada5
commit 7daab4530c
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/list.cpp
View File

@@ -16,8 +16,9 @@
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// headers // headers
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
#ifdef __GNUG__ #ifdef __GNUG__
#pragma implementation "list.h" #pragma implementation "list.h"
#endif #endif
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".
@@ -242,7 +243,10 @@ wxNodeBase *wxListBase::Append(void *object)
wxCHECK_MSG( m_keyType == wxKEY_NONE, (wxNodeBase *)NULL, wxCHECK_MSG( m_keyType == wxKEY_NONE, (wxNodeBase *)NULL,
wxT("need a key for the object to append") ); wxT("need a key for the object to append") );
wxNodeBase *node = CreateNode(m_nodeLast, (wxNodeBase *)NULL, object); // we use wxDefaultListKey even though it is the default parameter value
// because gcc under Mac OS X seems to miscompile this call otherwise
wxNodeBase *node = CreateNode(m_nodeLast, (wxNodeBase *)NULL, object,
wxDefaultListKey);
return AppendCommon(node); return AppendCommon(node);
} }
@@ -292,7 +296,8 @@ wxNodeBase *wxListBase::Insert(wxNodeBase *position, void *object)
next = m_nodeFirst; next = m_nodeFirst;
} }
wxNodeBase *node = CreateNode(prev, next, object); // wxDefaultListKey: see comment in Append() above
wxNodeBase *node = CreateNode(prev, next, object, wxDefaultListKey);
if ( !m_nodeFirst ) if ( !m_nodeFirst )
{ {
m_nodeLast = node; m_nodeLast = node;