From b33781717e5b29af1c0e6281b64d09242a4c2f67 Mon Sep 17 00:00:00 2001
From: Mathew Sutcliffe <oktal3700@gmail.com>
Date: Sat, 19 Mar 2016 21:07:56 +0000
Subject: [PATCH] refs #624 Remove noexcept from destructors, which are
 implicitly noexcept.

---
 src/blackmisc/lockfree.h        | 4 ++--
 src/blackmisc/statusexception.h | 2 +-
 src/blackmisc/valuecache.cpp    | 2 +-
 src/blackmisc/valuecache.h      | 2 +-
 src/blackmisc/variantprivate.h  | 2 +-
 src/blackmisc/worker.h          | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/blackmisc/lockfree.h b/src/blackmisc/lockfree.h
index 3b087ee1f..8ad788eac 100644
--- a/src/blackmisc/lockfree.h
+++ b/src/blackmisc/lockfree.h
@@ -142,7 +142,7 @@ namespace BlackMisc
         }
 
         //! Destructor. The original object will be overwritten by the new one stored in the writer.
-        ~LockFreeUniqueWriter() Q_DECL_NOEXCEPT
+        ~LockFreeUniqueWriter()
         {
             if (m_ptr.use_count() == 0) { return; } // *this has been moved from
             bool success = Private::atomic_compare_exchange_strong(m_now, &m_old, std::shared_ptr<const T>(m_ptr));
@@ -203,7 +203,7 @@ namespace BlackMisc
         }
 
         //! Destructor. The writer's changes must be committed before this is called.
-        ~LockFreeSharedWriter() Q_DECL_NOEXCEPT
+        ~LockFreeSharedWriter()
         {
             Q_ASSERT_X(m_ptr.use_count() == 0, qPrintable(name()), "SharedWriter destroyed without committing changes");
         }
diff --git a/src/blackmisc/statusexception.h b/src/blackmisc/statusexception.h
index 2d9756f68..b68493868 100644
--- a/src/blackmisc/statusexception.h
+++ b/src/blackmisc/statusexception.h
@@ -41,7 +41,7 @@ namespace BlackMisc
         const CStatusMessage &status() const { return m_payload; }
 
         //! Destructor.
-        ~CStatusException() Q_DECL_NOEXCEPT {}
+        ~CStatusException() {}
 
     private:
         const CStatusMessage   m_payload;
diff --git a/src/blackmisc/valuecache.cpp b/src/blackmisc/valuecache.cpp
index 6bd103f2c..d1e2ce997 100644
--- a/src/blackmisc/valuecache.cpp
+++ b/src/blackmisc/valuecache.cpp
@@ -365,7 +365,7 @@ namespace BlackMisc
         return page;
     }
 
-    CValueCache::BatchGuard::~BatchGuard() Q_DECL_NOEXCEPT
+    CValueCache::BatchGuard::~BatchGuard()
     {
         if (m_page)
         {
diff --git a/src/blackmisc/valuecache.h b/src/blackmisc/valuecache.h
index e27fe84cf..929099cf1 100644
--- a/src/blackmisc/valuecache.h
+++ b/src/blackmisc/valuecache.h
@@ -345,7 +345,7 @@ namespace BlackMisc
     {
     public:
         //! Destructor. Applies deferred changes.
-        ~BatchGuard() Q_DECL_NOEXCEPT;
+        ~BatchGuard();
 
         //! Deleted copy constructor. Class is move-only.
         BatchGuard(const BatchGuard &) = delete;
diff --git a/src/blackmisc/variantprivate.h b/src/blackmisc/variantprivate.h
index c9c9a066d..b36953665 100644
--- a/src/blackmisc/variantprivate.h
+++ b/src/blackmisc/variantprivate.h
@@ -86,7 +86,7 @@ namespace BlackMisc
 
             const QString &operationName() const { return m_operationName; }
 
-            ~CVariantException() Q_DECL_NOEXCEPT {}
+            ~CVariantException() {}
 
         private:
             QString m_operationName;
diff --git a/src/blackmisc/worker.h b/src/blackmisc/worker.h
index e64e7bf1f..b179f1044 100644
--- a/src/blackmisc/worker.h
+++ b/src/blackmisc/worker.h
@@ -32,7 +32,7 @@ namespace BlackMisc
         Q_OBJECT
     public:
         CSingleShotController(QObject *parent) : QObject(parent), m_strongRef(QSharedPointer<int>::create(0)) {}
-        ~CSingleShotController() Q_DECL_NOEXCEPT { auto wr = weakRef(); m_strongRef.clear(); waitForNull(wr); }
+        ~CSingleShotController() { auto wr = weakRef(); m_strongRef.clear(); waitForNull(wr); }
         QWeakPointer<int> weakRef() const { return m_strongRef.toWeakRef(); }
     private:
         static void waitForNull(QWeakPointer<int> wp) { while (wp) { QThread::msleep(10); } }
@@ -86,7 +86,7 @@ namespace BlackMisc
         CRegularThread(QObject *parent = nullptr) : QThread(parent) {}
 
         //! Destructor
-        ~CRegularThread() Q_DECL_NOEXCEPT
+        ~CRegularThread()
         {
             quit();
             wait();