Now Really wx free

master
Geoffrey Merck 4 years ago
parent f3e3bf4519
commit b2358d338b

@ -47,7 +47,7 @@ public:
void addData(const T data) void addData(const T data)
{ {
CMutexLocker locker(m_mutex); CMutexLocker locker(&m_mutex);
m_buffer[m_iPtr++] = data; m_buffer[m_iPtr++] = data;
@ -57,7 +57,7 @@ public:
T getData() T getData()
{ {
CMutexLocker locker(m_mutex); CMutexLocker locker(&m_mutex);
if (m_iPtr == m_oPtr) if (m_iPtr == m_oPtr)
return NULL; return NULL;
@ -72,7 +72,7 @@ public:
void clear() void clear()
{ {
CMutexLocker locker(m_mutex); CMutexLocker locker(&m_mutex);
m_iPtr = 0U; m_iPtr = 0U;
m_oPtr = 0U; m_oPtr = 0U;
@ -80,16 +80,16 @@ public:
::memset(m_buffer, 0x00, m_length * sizeof(T)); ::memset(m_buffer, 0x00, m_length * sizeof(T));
} }
bool isEmpty() bool empty()
{ {
CMutexLocker locker(m_mutex); CMutexLocker locker(&m_mutex);
return m_iPtr == m_oPtr; return m_iPtr == m_oPtr;
} }
T peek() T peek()
{ {
CMutexLocker locker(m_mutex); CMutexLocker locker(&m_mutex);
if (m_iPtr == m_oPtr) if (m_iPtr == m_oPtr)
return NULL; return NULL;
@ -102,7 +102,7 @@ private:
T* m_buffer; T* m_buffer;
volatile unsigned int m_iPtr; volatile unsigned int m_iPtr;
volatile unsigned int m_oPtr; volatile unsigned int m_oPtr;
wxMutex m_mutex; recursive_mutex m_mutex;
}; };
#endif #endif
Loading…
Cancel
Save

Powered by TurnKey Linux.