oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

thread/Posix{Mutex,Cond}: disable "constexpr" on Android

Browse Source 
Bionic's pthread declarations are non-literal.
This commit is contained in:
Max Kellermann 2014-02-18 09:36:24 +01:00
parent 6eda79d02d
commit 9b7f492c65
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/notify.hxx
View File

@ -28,7 +28,7 @@ struct notify {
Cond cond; Cond cond;
bool pending; bool pending;
#ifndef WIN32 #if !defined(WIN32) && !defined(__BIONIC__)
constexpr constexpr
#endif #endif
notify():pending(false) {} notify():pending(false) {}

5
src/thread/PosixCond.hxx
View File

@ -41,7 +41,10 @@ class PosixCond {
pthread_cond_t cond; pthread_cond_t cond;
public: public:
constexpr PosixCond():cond(PTHREAD_COND_INITIALIZER) {} #ifndef __BIONIC__
constexpr
#endif
PosixCond():cond(PTHREAD_COND_INITIALIZER) {}
PosixCond(const PosixCond &other) = delete; PosixCond(const PosixCond &other) = delete;
PosixCond &operator=(const PosixCond &other) = delete; PosixCond &operator=(const PosixCond &other) = delete;

5
src/thread/PosixMutex.hxx
View File

@ -41,7 +41,10 @@ class PosixMutex {
pthread_mutex_t mutex; pthread_mutex_t mutex;
public: public:
constexpr PosixMutex():mutex(PTHREAD_MUTEX_INITIALIZER) {} #ifndef __BIONIC__
constexpr
#endif
PosixMutex():mutex(PTHREAD_MUTEX_INITIALIZER) {}
PosixMutex(const PosixMutex &other) = delete; PosixMutex(const PosixMutex &other) = delete;
PosixMutex &operator=(const PosixMutex &other) = delete; PosixMutex &operator=(const PosixMutex &other) = delete;