commit ce7b062a6f75f4ebb67fd3c2db00262560fe466f
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Jan 04 10:47:46 2016 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Jan 05 10:36:01 2016 -0800
tree 49ea6871b989fb3729d14bc68e3ea5a12d9d5396
parent ed2aebafae2071abe9b1ba4fa11a3de0d6bcd59b

util: Workaround for gcc-4.7 being unable to deduce noexcept specifications

Change-Id: Ib8b00ff7a6293c4f8596615c4f2af266eab28a1a
Refs: #3384

src/util/scheduler-scoped-event-id.cpp

diff --git a/src/util/scheduler-scoped-event-id.cpp b/src/util/scheduler-scoped-event-id.cpp
index 2858749..7c307a8 100644
--- a/src/util/scheduler-scoped-event-id.cpp
+++ b/src/util/scheduler-scoped-event-id.cpp
@@ -52,7 +52,7 @@
   return *this;
 }
 
-ScopedEventId::~ScopedEventId()
+ScopedEventId::~ScopedEventId() noexcept
 {
   m_scheduler->cancelEvent(m_event);
 }
@@ -64,7 +64,7 @@
 }
 
 void
-ScopedEventId::release()
+ScopedEventId::release() noexcept
 {
   m_event.reset();
 }

src/util/scheduler-scoped-event-id.hpp

diff --git a/src/util/scheduler-scoped-event-id.hpp b/src/util/scheduler-scoped-event-id.hpp
index 1391d5d..c2192f5 100644
--- a/src/util/scheduler-scoped-event-id.hpp
+++ b/src/util/scheduler-scoped-event-id.hpp
@@ -57,7 +57,7 @@
 
   /** \brief cancels the event
    */
-  ~ScopedEventId();
+  ~ScopedEventId() noexcept;
 
   /** \brief cancels the event manually
    */
@@ -68,7 +68,7 @@
    *         when this ScopedEventId is destructed
    */
   void
-  release();
+  release() noexcept;
 
 private:
   Scheduler* m_scheduler; // pointer to allow move semantics

src/util/signal-scoped-connection.cpp

diff --git a/src/util/signal-scoped-connection.cpp b/src/util/signal-scoped-connection.cpp
index 2ebbb08..64c5774 100644
--- a/src/util/signal-scoped-connection.cpp
+++ b/src/util/signal-scoped-connection.cpp
@@ -55,7 +55,7 @@
   return *this;
 }
 
-ScopedConnection::~ScopedConnection()
+ScopedConnection::~ScopedConnection() noexcept
 {
   m_connection.disconnect();
 }

src/util/signal-scoped-connection.hpp

diff --git a/src/util/signal-scoped-connection.hpp b/src/util/signal-scoped-connection.hpp
index a659844..2e93708 100644
--- a/src/util/signal-scoped-connection.hpp
+++ b/src/util/signal-scoped-connection.hpp
@@ -54,7 +54,7 @@
 
   /** \brief disconnects the connection
    */
-  ~ScopedConnection();
+  ~ScopedConnection() noexcept;
 
   /** \brief disconnects the connection manually
    */