flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-05-02 07:05:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #437 Adjust static assert, caught one more case of CVariant containing CVariant.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2015-06-01 18:00:16 +01:00
parent 6a2af9d387
commit 8db8fdef94
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackmisc/propertyindexvariantmap.h
View File

@@ -149,7 +149,7 @@ namespace BlackMisc
bool isEmpty() const { return this->m_values.isEmpty(); } bool isEmpty() const { return this->m_values.isEmpty(); }
//! Value //! 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 //! Set value
void value(const CPropertyIndex &index, const CVariant &value) { this->m_values.value(index, value); } void value(const CPropertyIndex &index, const CVariant &value) { this->m_values.value(index, value); }

4
src/blackmisc/variant.h
View File

@@ -174,14 +174,14 @@ namespace BlackMisc
//! Construct a variant from a value. //! Construct a variant from a value.
template <typename T> static CVariant fromValue(T &&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))); return CVariant(QVariant::fromValue(std::forward<T>(value)));
} }
//! Synonym for fromValue(). //! Synonym for fromValue().
template <typename T> static CVariant from(T &&value) 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))); return CVariant(QVariant::fromValue(std::forward<T>(value)));
} }