summaryrefslogtreecommitdiff
path: root/src/thread
diff options
context:
space:
mode:
authorMax Kellermann <max@musicpd.org>2017-06-04 12:57:05 +0200
committerMax Kellermann <max@musicpd.org>2017-06-04 12:57:05 +0200
commit979f1b6c39b64770f42ed125c0abf80f4938fdb5 (patch)
tree3d254376552957afc6c6c77661a60954a83e41ce /src/thread
parent1fa1790da5a7fb1bd4a5deef36b7ed8d9c60acbc (diff)
parentcf86dfd3178bcdffbb2968cda4ad9c271ffdc4f3 (diff)
Merge tag 'v0.20.9'
release v0.20.9
Diffstat (limited to 'src/thread')
-rw-r--r--src/thread/Id.hxx6
-rw-r--r--src/thread/Thread.hxx2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/thread/Id.hxx b/src/thread/Id.hxx
index 169cb1af8..4b0b9109e 100644
--- a/src/thread/Id.hxx
+++ b/src/thread/Id.hxx
@@ -53,7 +53,7 @@ public:
#endif
gcc_const
- static ThreadId Null() {
+ static ThreadId Null() noexcept {
#ifdef WIN32
return 0;
#else
@@ -63,7 +63,7 @@ public:
}
gcc_pure
- bool IsNull() const {
+ bool IsNull() const noexcept {
return *this == Null();
}
@@ -80,7 +80,7 @@ public:
}
gcc_pure
- bool operator==(const ThreadId &other) const {
+ bool operator==(const ThreadId &other) const noexcept {
#ifdef WIN32
return id == other.id;
#else
diff --git a/src/thread/Thread.hxx b/src/thread/Thread.hxx
index 86a3efae3..0251f46ec 100644
--- a/src/thread/Thread.hxx
+++ b/src/thread/Thread.hxx
@@ -78,7 +78,7 @@ public:
* Check if this thread is the current thread.
*/
gcc_pure
- bool IsInside() const {
+ bool IsInside() const noexcept {
#ifdef WIN32
return GetCurrentThreadId() == id;
#else