diff --git a/src/neighbor/Explorer.hxx b/src/neighbor/Explorer.hxx index d5559349d..b62f04b1f 100644 --- a/src/neighbor/Explorer.hxx +++ b/src/neighbor/Explorer.hxx @@ -61,12 +61,12 @@ public: /** * Stop exploring. */ - virtual void Close() = 0; + virtual void Close() noexcept = 0; /** * Obtain a list of currently known neighbors. */ - virtual List GetList() const = 0; + virtual List GetList() const noexcept = 0; }; #endif diff --git a/src/neighbor/plugins/SmbclientNeighborPlugin.cxx b/src/neighbor/plugins/SmbclientNeighborPlugin.cxx index 1798dd7f6..97437add9 100644 --- a/src/neighbor/plugins/SmbclientNeighborPlugin.cxx +++ b/src/neighbor/plugins/SmbclientNeighborPlugin.cxx @@ -74,8 +74,8 @@ public: /* virtual methods from class NeighborExplorer */ void Open() override; - void Close() override; - List GetList() const override; + void Close() noexcept override; + List GetList() const noexcept override; private: void Run(); @@ -90,7 +90,7 @@ SmbclientNeighborExplorer::Open() } void -SmbclientNeighborExplorer::Close() +SmbclientNeighborExplorer::Close() noexcept { mutex.lock(); quit = true; @@ -101,7 +101,7 @@ SmbclientNeighborExplorer::Close() } NeighborExplorer::List -SmbclientNeighborExplorer::GetList() const +SmbclientNeighborExplorer::GetList() const noexcept { const std::lock_guard protect(mutex); /* diff --git a/src/neighbor/plugins/UpnpNeighborPlugin.cxx b/src/neighbor/plugins/UpnpNeighborPlugin.cxx index be731c5f1..fba10328f 100644 --- a/src/neighbor/plugins/UpnpNeighborPlugin.cxx +++ b/src/neighbor/plugins/UpnpNeighborPlugin.cxx @@ -64,8 +64,8 @@ public: /* virtual methods from class NeighborExplorer */ void Open() override; - void Close() override; - List GetList() const override; + void Close() noexcept override; + List GetList() const noexcept override; private: /* virtual methods from class UPnPDiscoveryListener */ @@ -91,14 +91,14 @@ UpnpNeighborExplorer::Open() } void -UpnpNeighborExplorer::Close() +UpnpNeighborExplorer::Close() noexcept { delete discovery; UpnpClientGlobalFinish(); } NeighborExplorer::List -UpnpNeighborExplorer::GetList() const +UpnpNeighborExplorer::GetList() const noexcept { std::vector tmp;