aboutsummaryrefslogtreecommitdiffstats
path: root/src/thread/PosixMutex.hxx
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2015-08-25 12:46:12 +0200
committerMax Kellermann <max@duempel.org>2015-08-25 12:46:12 +0200
commit75dff6445063d9b49cca126fd661c9abbd680977 (patch)
tree585a91e6e91b7f5641d2093d98a4bf43df29d531 /src/thread/PosixMutex.hxx
parentf0b58c6f2463da0b7f509a53d8054d5472504094 (diff)
downloadmpd-75dff6445063d9b49cca126fd661c9abbd680977.tar.gz
mpd-75dff6445063d9b49cca126fd661c9abbd680977.tar.xz
mpd-75dff6445063d9b49cca126fd661c9abbd680977.zip
thread/Posix{Mutex,Cond}: use "constexpr" only with glibc
Apparently all other C libraries are not compatible with "constexpr". Those which are not will get a performance penalty, but at least they work at all.
Diffstat (limited to 'src/thread/PosixMutex.hxx')
-rw-r--r--src/thread/PosixMutex.hxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/thread/PosixMutex.hxx b/src/thread/PosixMutex.hxx
index 5805158d5..e0fd614c8 100644
--- a/src/thread/PosixMutex.hxx
+++ b/src/thread/PosixMutex.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009-2013 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2009-2015 Max Kellermann <max@duempel.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -41,9 +41,13 @@ class PosixMutex {
pthread_mutex_t mutex;
public:
-#if defined(__NetBSD__) || defined(__BIONIC__)
- /* NetBSD's PTHREAD_MUTEX_INITIALIZER is not compatible with
- "constexpr" */
+#ifdef __GLIBC__
+ /* optimized constexpr constructor for pthread implementations
+ that support it */
+ constexpr PosixMutex():mutex(PTHREAD_MUTEX_INITIALIZER) {}
+#else
+ /* slow fallback for pthread implementations that are not
+ compatible with "constexpr" */
PosixMutex() {
pthread_mutex_init(&mutex, nullptr);
}
@@ -51,10 +55,6 @@ public:
~PosixMutex() {
pthread_mutex_destroy(&mutex);
}
-#else
- /* optimized constexpr constructor for sane POSIX
- implementations */
- constexpr PosixMutex():mutex(PTHREAD_MUTEX_INITIALIZER) {}
#endif
PosixMutex(const PosixMutex &other) = delete;