mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-06 23:05:04 +01:00
Merge b0db1009f5 into 6ce8358709
This commit is contained in:
commit
56c49da888
1 changed files with 3 additions and 7 deletions
|
|
@ -23,6 +23,7 @@
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <pthread.h>
|
#include <pthread.h>
|
||||||
|
#include <cstring>
|
||||||
|
|
||||||
#include <glibmm/threads.h>
|
#include <glibmm/threads.h>
|
||||||
|
|
||||||
|
|
@ -73,20 +74,15 @@ protected:
|
||||||
};
|
};
|
||||||
typedef typename RequestBuffer::rw_vector RequestBufferVector;
|
typedef typename RequestBuffer::rw_vector RequestBufferVector;
|
||||||
|
|
||||||
#if defined(COMPILER_MINGW) && defined(PTW32_VERSION)
|
|
||||||
struct pthread_cmp
|
struct pthread_cmp
|
||||||
{
|
{
|
||||||
bool operator() (const ptw32_handle_t& thread1, const ptw32_handle_t& thread2)
|
bool operator() (const pthread_t& a, const pthread_t& b) const noexcept
|
||||||
{
|
{
|
||||||
return thread1.p < thread2.p;
|
return std::memcmp(&a, &b, sizeof(pthread_t)) < 0;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
typedef typename std::map<pthread_t,RequestBuffer*, pthread_cmp>::iterator RequestBufferMapIterator;
|
typedef typename std::map<pthread_t,RequestBuffer*, pthread_cmp>::iterator RequestBufferMapIterator;
|
||||||
typedef std::map<pthread_t,RequestBuffer*, pthread_cmp> RequestBufferMap;
|
typedef std::map<pthread_t,RequestBuffer*, pthread_cmp> RequestBufferMap;
|
||||||
#else
|
|
||||||
typedef typename std::map<pthread_t,RequestBuffer*>::iterator RequestBufferMapIterator;
|
|
||||||
typedef std::map<pthread_t,RequestBuffer*> RequestBufferMap;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
RequestBufferMap request_buffers;
|
RequestBufferMap request_buffers;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue