From 0d29334a8d62e63df19745d346fdebd989e52ceb Mon Sep 17 00:00:00 2001 From: Rafal Krypa Date: Wed, 13 Jul 2016 16:19:00 +0200 Subject: [PATCH] Fix compilation with GCC 4.7 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit GCC 4.7 has some weird behaviour expecting some destructors to be declared explicitly with "noexcept(true)": In file included from /data/src/security/nether/src/nether_Manager.cpp:25:0: /data/src/security/nether/src/../include/nether_Manager.h:37:3: error: looser throw specifier for ‘virtual NetherManager::~NetherManager()’ In file included from /data/src/security/nether/src/../include/nether_Manager.h:28:0, from /data/src/security/nether/src/nether_Manager.cpp:25: /data/src/security/nether/src/../include/nether_Types.h:200:11: error: overriding ‘virtual NetherVerdictListener::~NetherVerdictListener() noexcept (true)’ Change-Id: I2b12d7b6255d4057a3b9f198c1ca2c5c9d477ea1 --- include/nether_Manager.h | 2 +- src/nether_Manager.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/nether_Manager.h b/include/nether_Manager.h index 6e88344..23e7557 100644 --- a/include/nether_Manager.h +++ b/include/nether_Manager.h @@ -34,7 +34,7 @@ class NetherManager : public NetherVerdictListener, public NetherProcessedPacket { public: NetherManager(const NetherConfig &_netherConfig); - ~NetherManager(); + ~NetherManager() noexcept(true); bool initialize(); bool process(); NetherConfig &getConfig(); diff --git a/src/nether_Manager.cpp b/src/nether_Manager.cpp index 844e760..28c17c1 100644 --- a/src/nether_Manager.cpp +++ b/src/nether_Manager.cpp @@ -45,7 +45,7 @@ NetherManager::NetherManager(const NetherConfig &_netherConfig) netherFallbackPolicyBackend = std::unique_ptr (new NetherDummyBackend(netherConfig)); } -NetherManager::~NetherManager() +NetherManager::~NetherManager() noexcept(true) { close(signalDescriptor); } -- 2.7.4