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

use static functions instead of static variables for critical sections to avoid crashing if a log function using a CS is called during static objects initialization

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52594 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-03-17 21:09:02 +00:00
parent 5cfb6fee91
commit 766aecab3a
2 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/log.h
View File

@@ -14,10 +14,6 @@
#include "wx/defs.h"
#if wxUSE_THREADS
class WXDLLIMPEXP_FWD_BASE wxCriticalSection;
#endif
// ----------------------------------------------------------------------------
// common constants for use in wxUSE_LOG/!wxUSE_LOG
// ----------------------------------------------------------------------------
@@ -324,9 +320,6 @@ private:
// with the number of times it was repeated
static bool ms_bRepetCounting;
#if wxUSE_THREADS
static wxCriticalSection ms_prevCS; // protects the ms_prev values below
#endif
static wxString ms_prevString; // previous message that was logged
static unsigned ms_prevCounter; // how many times it was repeated
static time_t ms_prevTimeStamp;// timestamp of the previous message
@@ -345,9 +338,6 @@ private:
// disabled
static wxString ms_timestamp;
#if wxUSE_THREADS
static wxCriticalSection ms_traceCS; // protects ms_aTraceMasks
#endif
static wxTraceMask ms_ulTraceMask; // controls wxLogTrace behaviour
static wxArrayString ms_aTraceMasks; // more powerful filter for wxLogTrace
};