From fe2f8c088aa6a4ae97283e0b81a76bbbc51132fc Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 2 Aug 2019 14:44:00 +0200 Subject: [PATCH] Partition, ...: add `noexcept` to callback methods --- src/Partition.cxx | 2 +- src/Partition.hxx | 2 +- src/db/update/Service.cxx | 2 +- src/db/update/Service.hxx | 2 +- src/storage/plugins/NfsStorage.cxx | 2 +- src/zeroconf/AvahiPoll.cxx | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Partition.cxx b/src/Partition.cxx index 273c08f29..92ab0a6b2 100644 --- a/src/Partition.cxx +++ b/src/Partition.cxx @@ -208,7 +208,7 @@ Partition::OnMixerVolumeChanged(Mixer &, int) noexcept } void -Partition::OnGlobalEvent(unsigned mask) +Partition::OnGlobalEvent(unsigned mask) noexcept { if ((mask & SYNC_WITH_PLAYER) != 0) SyncWithPlayer(); diff --git a/src/Partition.hxx b/src/Partition.hxx index 0bbe017df..c9179ff35 100644 --- a/src/Partition.hxx +++ b/src/Partition.hxx @@ -267,7 +267,7 @@ private: void OnMixerVolumeChanged(Mixer &mixer, int volume) noexcept override; /* callback for #global_events */ - void OnGlobalEvent(unsigned mask); + void OnGlobalEvent(unsigned mask) noexcept; }; #endif diff --git a/src/db/update/Service.cxx b/src/db/update/Service.cxx index 290655adc..1f9f17b4a 100644 --- a/src/db/update/Service.cxx +++ b/src/db/update/Service.cxx @@ -106,7 +106,7 @@ UpdateService::CancelMount(const char *uri) } inline void -UpdateService::Task() +UpdateService::Task() noexcept { assert(walk != nullptr); diff --git a/src/db/update/Service.hxx b/src/db/update/Service.hxx index 470879cd6..fb65abb6e 100644 --- a/src/db/update/Service.hxx +++ b/src/db/update/Service.hxx @@ -110,7 +110,7 @@ private: void RunDeferred() noexcept; /* the update thread */ - void Task(); + void Task() noexcept; void StartThread(UpdateQueueItem &&i); diff --git a/src/storage/plugins/NfsStorage.cxx b/src/storage/plugins/NfsStorage.cxx index 5f5dda742..d67283c3a 100644 --- a/src/storage/plugins/NfsStorage.cxx +++ b/src/storage/plugins/NfsStorage.cxx @@ -122,7 +122,7 @@ public: } /* callback for #reconnect_timer */ - void OnReconnectTimer() { + void OnReconnectTimer() noexcept { assert(state == State::DELAY); Connect(); diff --git a/src/zeroconf/AvahiPoll.cxx b/src/zeroconf/AvahiPoll.cxx index 791fce12e..94365ee1a 100644 --- a/src/zeroconf/AvahiPoll.cxx +++ b/src/zeroconf/AvahiPoll.cxx @@ -107,7 +107,7 @@ public: } private: - void OnTimeout() { + void OnTimeout() noexcept { callback(this, userdata); } };