From 3439edf946953fbde46b74d444921b40a795e3e5 Mon Sep 17 00:00:00 2001
From: Mathew Sutcliffe <oktal3700@gmail.com>
Date: Tue, 21 Feb 2017 02:06:19 +0000
Subject: [PATCH] Fixed warning and error found by Clang svn-trunk.

---
 src/blackmisc/datacache.cpp |  2 +-
 src/blackmisc/typetraits.h  | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/blackmisc/datacache.cpp b/src/blackmisc/datacache.cpp
index 32cdc549c..e71b372da 100644
--- a/src/blackmisc/datacache.cpp
+++ b/src/blackmisc/datacache.cpp
@@ -326,7 +326,7 @@ namespace BlackMisc
 
     void CDataCacheSerializer::deliverPromises(std::vector<std::promise<void>> i_promises)
     {
-        QTimer::singleShot(0, Qt::PreciseTimer, this, [this, promises = std::make_shared<decltype(i_promises)>(std::move(i_promises))]()
+        QTimer::singleShot(0, Qt::PreciseTimer, this, [promises = std::make_shared<decltype(i_promises)>(std::move(i_promises))]()
         {
             for (auto &promise : *promises)
             {
diff --git a/src/blackmisc/typetraits.h b/src/blackmisc/typetraits.h
index 539a14cd9..5f6d548f1 100644
--- a/src/blackmisc/typetraits.h
+++ b/src/blackmisc/typetraits.h
@@ -57,6 +57,14 @@ namespace BlackMisc
             }
             static constexpr bool value = impl();
         };
+
+        //! \private Dummy that derives from T if T is a class.
+        template <typename T, bool = std::is_class<T>::value>
+        struct SyntheticDerived : public T {};
+        //! \cond
+        template <typename T>
+        struct SyntheticDerived<T, false> {};
+        //! \endcond
     }
 
     /*!
@@ -213,7 +221,7 @@ namespace BlackMisc
     struct TIsQPrivateSignal : public std::false_type {};
     //! \cond
     template <typename T>
-    struct TIsQPrivateSignal<T, void_t<typename T::QPrivateSignal>> : public std::is_same<T, typename T::QPrivateSignal> {};
+    struct TIsQPrivateSignal<T, void_t<typename Private::SyntheticDerived<T>::QPrivateSignal>> : public std::is_same<T, typename Private::SyntheticDerived<T>::QPrivateSignal> {};
     //! \endcond
 
 }