From 0b850f25d2924ee0e5ea08f93fffaa63f62f9104 Mon Sep 17 00:00:00 2001 From: Michael Wetherell Date: Sat, 15 Jul 2006 22:21:44 +0000 Subject: [PATCH] Put the reentrance check inside #ifdef __DEBUG__ git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/object.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/common/object.cpp b/src/common/object.cpp index 0fb4fae976..0a77aab57b 100644 --- a/src/common/object.cpp +++ b/src/common/object.cpp @@ -224,9 +224,11 @@ void wxClassInfo::Register() sm_classTable = classTable; } +#ifdef __WXDEBUG__ // reentrance guard - see note above static int entry = 0; wxASSERT_MSG(++entry == 1, _T("wxClassInfo::Register() reentrance")); +#endif // Using IMPLEMENT_DYNAMIC_CLASS() macro twice (which may happen if you // 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); +#ifdef __WXDEBUG__ --entry; +#endif } void wxClassInfo::Unregister() -- 2.45.2