From 8db8fdef94b05b2cb14ad9a6d5c180a1040319bf Mon Sep 17 00:00:00 2001
From: Mathew Sutcliffe <oktal3700@gmail.com>
Date: Mon, 1 Jun 2015 18:00:16 +0100
Subject: [PATCH] refs #437 Adjust static assert, caught one more case of
 CVariant containing CVariant.

---
 src/blackmisc/propertyindexvariantmap.h | 2 +-
 src/blackmisc/variant.h                 | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/blackmisc/propertyindexvariantmap.h b/src/blackmisc/propertyindexvariantmap.h
index c12321a7f..2ad9ea3b7 100644
--- a/src/blackmisc/propertyindexvariantmap.h
+++ b/src/blackmisc/propertyindexvariantmap.h
@@ -149,7 +149,7 @@ namespace BlackMisc
         bool isEmpty() const { return this->m_values.isEmpty(); }
 
         //! Value
-        CVariant value(const CPropertyIndex &index) const { return CVariant::from(this->m_values.value(index)); }
+        CVariant value(const CPropertyIndex &index) const { return this->m_values.value(index); }
 
         //! Set value
         void value(const CPropertyIndex &index, const CVariant &value) { this->m_values.value(index, value); }
diff --git a/src/blackmisc/variant.h b/src/blackmisc/variant.h
index 104f32b8e..e284544ec 100644
--- a/src/blackmisc/variant.h
+++ b/src/blackmisc/variant.h
@@ -174,14 +174,14 @@ namespace BlackMisc
         //! Construct a variant from a value.
         template <typename T> static CVariant fromValue(T &&value)
         {
-            static_assert(!std::is_same<CVariant, T>::value, "CVariant is an illegal type!");
+            static_assert(!std::is_same<CVariant, typename std::decay<T>::type>::value, "CVariant is an illegal type!");
             return CVariant(QVariant::fromValue(std::forward<T>(value)));
         }
 
         //! Synonym for fromValue().
         template <typename T> static CVariant from(T &&value)
         {
-            static_assert(!std::is_same<CVariant, T>::value, "CVariant is an illegal type!");
+            static_assert(!std::is_same<CVariant, typename std::decay<T>::type>::value, "CVariant is an illegal type!");
             return CVariant(QVariant::fromValue(std::forward<T>(value)));
         }