Fix compilation with GCC 4.7
authorRafal Krypa <r.krypa@samsung.com>
Wed, 13 Jul 2016 14:19:00 +0000 (16:19 +0200)
committerKrzysztof Jackiewicz <k.jackiewicz@samsung.com>
Fri, 29 Jul 2016 08:45:24 +0000 (10:45 +0200)
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
src/nether_Manager.cpp

index 6e88344..23e7557 100644 (file)
@@ -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();
index 844e760..28c17c1 100644 (file)
@@ -45,7 +45,7 @@ NetherManager::NetherManager(const NetherConfig &_netherConfig)
        netherFallbackPolicyBackend = std::unique_ptr<NetherPolicyBackend> (new NetherDummyBackend(netherConfig));
 }
 
-NetherManager::~NetherManager()
+NetherManager::~NetherManager() noexcept(true)
 {
        close(signalDescriptor);
 }