fix for FreeBSD compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4456 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -175,10 +175,8 @@ private:
|
|||||||
class WXDLLEXPORT wxCriticalSectionLocker
|
class WXDLLEXPORT wxCriticalSectionLocker
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
wxCriticalSectionLocker(wxCriticalSection& critsect) : m_critsect(critsect)
|
inline wxCriticalSectionLocker(wxCriticalSection& critsect);
|
||||||
{ m_critsect.Enter(); }
|
inline ~wxCriticalSectionLocker();
|
||||||
~wxCriticalSectionLocker()
|
|
||||||
{ m_critsect.Leave(); }
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
// no assignment operator nor copy ctor
|
// no assignment operator nor copy ctor
|
||||||
@@ -383,7 +381,9 @@ public:
|
|||||||
// -----------------------------------------------------------------------------
|
// -----------------------------------------------------------------------------
|
||||||
// implementation only until the end of file
|
// implementation only until the end of file
|
||||||
// -----------------------------------------------------------------------------
|
// -----------------------------------------------------------------------------
|
||||||
|
|
||||||
#if wxUSE_THREADS
|
#if wxUSE_THREADS
|
||||||
|
|
||||||
#if defined(__WXMSW__)
|
#if defined(__WXMSW__)
|
||||||
// unlock GUI if there are threads waiting for and lock it back when
|
// unlock GUI if there are threads waiting for and lock it back when
|
||||||
// there are no more of them - should be called periodically by the main
|
// there are no more of them - should be called periodically by the main
|
||||||
@@ -415,6 +415,14 @@ public:
|
|||||||
inline void wxCriticalSection::Enter() { (void)m_mutex.Lock(); }
|
inline void wxCriticalSection::Enter() { (void)m_mutex.Lock(); }
|
||||||
inline void wxCriticalSection::Leave() { (void)m_mutex.Unlock(); }
|
inline void wxCriticalSection::Leave() { (void)m_mutex.Unlock(); }
|
||||||
#endif // MSW/!MSW
|
#endif // MSW/!MSW
|
||||||
|
|
||||||
|
// we can define these inline functions now (they should be defined after
|
||||||
|
// wxCriticalSection::Enter/Leave)
|
||||||
|
inline
|
||||||
|
wxCriticalSectionLocker:: wxCriticalSectionLocker(wxCriticalSection& cs)
|
||||||
|
: m_critsect(cs) { m_critsect.Enter(); }
|
||||||
|
inline
|
||||||
|
wxCriticalSectionLocker::~wxCriticalSectionLocker() { m_critsect.Leave(); }
|
||||||
#endif // wxUSE_THREADS
|
#endif // wxUSE_THREADS
|
||||||
|
|
||||||
#endif // __THREADH__
|
#endif // __THREADH__
|
||||||
|
Reference in New Issue
Block a user