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

Put the reentrance check inside #ifdef __DEBUG__

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2006-07-15 22:21:44 +00:00
parent 65d586566d
commit 0b850f25d2
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/object.cpp
View File

@@ -224,9 +224,11 @@ void wxClassInfo::Register()
sm_classTable = classTable; sm_classTable = classTable;
} }
#ifdef __WXDEBUG__
// reentrance guard - see note above // reentrance guard - see note above
static int entry = 0; static int entry = 0;
wxASSERT_MSG(++entry == 1, _T("wxClassInfo::Register() reentrance")); wxASSERT_MSG(++entry == 1, _T("wxClassInfo::Register() reentrance"));
#endif
// Using IMPLEMENT_DYNAMIC_CLASS() macro twice (which may happen if you // Using IMPLEMENT_DYNAMIC_CLASS() macro twice (which may happen if you
// link any object module twice mistakenly, or link twice against wx shared // link any object module twice mistakenly, or link twice against wx shared
@@ -243,7 +245,9 @@ void wxClassInfo::Register()
sm_classTable->Put(m_className, (wxObject *)this); sm_classTable->Put(m_className, (wxObject *)this);
#ifdef __WXDEBUG__
--entry; --entry;
#endif
} }
void wxClassInfo::Unregister() void wxClassInfo::Unregister()