smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 23:05:04 +01:00
Code Issues Projects Releases Wiki Activity

Merge df82c4714e into 52af610937

Browse source
This commit is contained in:
EZ4Stephen 2025-12-01 14:32:42 +01:00 • committed by GitHub
commit f5f080f244
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 2 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

16
libs/pbd/pbd/abstract_ui.h
View file

@ -73,20 +73,8 @@ protected:
}; };
typedef typename RequestBuffer::rw_vector RequestBufferVector; typedef typename RequestBuffer::rw_vector RequestBufferVector;
#if defined(COMPILER_MINGW) && defined(PTW32_VERSION) typedef typename std::map<pthread_t, RequestBuffer*, std::less<>>::iterator RequestBufferMapIterator;
struct pthread_cmp typedef std::map<pthread_t, RequestBuffer*, std::less<>> RequestBufferMap;
{
bool operator() (const ptw32_handle_t& thread1, const ptw32_handle_t& thread2)
{
return thread1.p < thread2.p;
}
};
typedef typename std::map<pthread_t,RequestBuffer*, pthread_cmp>::iterator RequestBufferMapIterator;
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;

9
libs/pbd/pbd/abstract_ui.inc.cc
View file

@ -32,15 +32,6 @@
#include "pbd/i18n.h" #include "pbd/i18n.h"
#ifdef COMPILER_MSVC
#include <ardourext/misc.h> // Needed for 'DECLARE_DEFAULT_COMPARISONS'. Objects in an STL container can be
// searched and sorted. Thus, when instantiating the container, MSVC complains
// if the type of object being contained has no appropriate comparison operators
// defined (specifically, if operators '<' and '==' are undefined). This seems
// to be the case with ptw32 'pthread_t' which is a simple struct.
DECLARE_DEFAULT_COMPARISONS(ptw32_handle_t)
#endif
using namespace std; using namespace std;
#ifndef NDEBUG #ifndef NDEBUG

17
msvc_extra_headers/ardourext/misc.h.input
View file

@ -242,14 +242,6 @@ inline int64_t abs(int64_t val) throw()
#if defined(LIBPBD_DLL) || defined(PBD_IS_IN_WIN_STATIC_LIB) #if defined(LIBPBD_DLL) || defined(PBD_IS_IN_WIN_STATIC_LIB)
#include <pbd/msvc_pbd.h> #include <pbd/msvc_pbd.h>
#ifdef LIBPBD_DLL
#define DEFAULT_COMPARISONS_DEFINED
#define DECLARE_DEFAULT_COMPARISONS(Type) \
LIBPBD_API bool operator > (const Type& lhs, const Type& rhs); \
LIBPBD_API bool operator < (const Type& lhs, const Type& rhs); \
LIBPBD_API bool operator != (const Type& lhs, const Type& rhs); \
LIBPBD_API bool operator == (const Type& lhs, const Type& rhs);
#endif
#endif #endif
#if defined(BUILDING_LIBARDOUR) || defined(LIBARDOUR_IS_IN_WIN_STATIC_LIB) #if defined(BUILDING_LIBARDOUR) || defined(LIBARDOUR_IS_IN_WIN_STATIC_LIB)
#include <ardour/msvc_libardour.h> #include <ardour/msvc_libardour.h>
@ -259,15 +251,6 @@ inline int64_t abs(int64_t val) throw()
#endif #endif
#endif // __cplusplus #endif // __cplusplus
#ifndef DEFAULT_COMPARISONS_DEFINED
#define DEFAULT_COMPARISONS_DEFINED
#define DECLARE_DEFAULT_COMPARISONS(Type) \
extern bool operator > (const Type& lhs, const Type& rhs); \
extern bool operator < (const Type& lhs, const Type& rhs); \
extern bool operator != (const Type& lhs, const Type& rhs); \
extern bool operator == (const Type& lhs, const Type& rhs);
#endif
#if !defined(LIBPBD_API) || defined(PBD_IS_IN_WIN_STATIC_LIB) #if !defined(LIBPBD_API) || defined(PBD_IS_IN_WIN_STATIC_LIB)
// Emulate some C99 math functions which MSVC itself didn't // Emulate some C99 math functions which MSVC itself didn't
// implement until later in life. // implement until later in life.