townforge/Urho3D
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "core: add VariantMapVector to the variant types"

Browse Source 
This reverts commit 3a86d00996.

Now obsoleted
This commit is contained in:
Crypto City 2020-11-24 03:16:51 +00:00
parent f2abc7cb83
commit 3576f662c0
2 changed files with 0 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Urho3D/Core/Variant.cpp
View File

@ -36,7 +36,6 @@ const ResourceRef Variant::emptyResourceRef { };
const ResourceRefList Variant::emptyResourceRefList { };
const VariantMap Variant::emptyVariantMap;
const VariantVector Variant::emptyVariantVector { };
const VariantMapVector Variant::emptyVariantMapVector { };
const StringVector Variant::emptyStringVector { };
static const char* typeNames[] =
@ -68,7 +67,6 @@ static const char* typeNames[] =
"Rect",
"IntVector3",
"Int64",
"VariantMapVector",
"CustomHeap",
"CustomStack",
nullptr
@ -673,10 +671,6 @@ void Variant::SetType(VariantType newType)
delete value_.matrix4_;
break;
case VAR_VARIANTMAPVECTOR:
value_.variantMapVector_.~VariantMapVector();
break;
case VAR_CUSTOM_HEAP:
delete value_.customValueHeap_;
break;
@ -737,10 +731,6 @@ void Variant::SetType(VariantType newType)
value_.matrix4_ = new Matrix4();
break;
case VAR_VARIANTMAPVECTOR:
new(&value_.variantMapVector_) VariantMapVector();
break;
case VAR_CUSTOM_HEAP:
// Must be initialized later
value_.customValueHeap_ = nullptr;
@ -891,11 +881,6 @@ template <> VariantVector Variant::Get<VariantVector>() const
return GetVariantVector();
}
template <> VariantMapVector Variant::Get<VariantMapVector>() const
{
return GetVariantMapVector();
}
template <> StringVector Variant::Get<StringVector >() const
{
return GetStringVector();

43
Source/Urho3D/Core/Variant.h
View File

@ -67,7 +67,6 @@ enum VariantType
VAR_RECT,
VAR_INTVECTOR3,
VAR_INT64,
VAR_VARIANTMAPVECTOR,
// Add new types here
VAR_CUSTOM_HEAP,
VAR_CUSTOM_STACK,
@ -86,9 +85,6 @@ using StringVector = Vector<String>;
/// Map of variants.
using VariantMap = HashMap<StringHash, Variant>;
/// Vector of variants maps.
using VariantMapVector = Vector<VariantMap>;
/// Typed resource reference.
struct URHO3D_API ResourceRef
{
@ -308,7 +304,6 @@ union VariantValue
String string_;
StringVector stringVector_;
VariantVector variantVector_;
VariantMapVector variantMapVector_;
VariantMap variantMap_;
PODVector<unsigned char> buffer_;
ResourceRef resourceRef_;
@ -459,12 +454,6 @@ public:
*this = value;
}
/// Construct from a variant map vector.
Variant(const VariantMapVector& value) // NOLINT(google-explicit-constructor)
{
*this = value;
}
/// Construct from a variant map.
Variant(const VariantMap& value) // NOLINT(google-explicit-constructor)
{
@ -740,14 +729,6 @@ public:
return *this;
}
/// Assign from a variant map vector.
Variant& operator =(const VariantMapVector& rhs)
{
SetType(VAR_VARIANTMAPVECTOR);
value_.variantMapVector_ = rhs;
return *this;
}
/// Assign from a string vector.
Variant& operator =(const StringVector& rhs)
{
@ -930,12 +911,6 @@ public:
return type_ == VAR_VARIANTVECTOR ? value_.variantVector_ == rhs : false;
}
/// Test for equality with a variant map vector. To return true, both the type and value must match.
bool operator ==(const VariantMapVector& rhs) const
{
return type_ == VAR_VARIANTMAPVECTOR ? value_.variantMapVector_ == rhs : false;
}
/// Test for equality with a string vector. To return true, both the type and value must match.
bool operator ==(const StringVector& rhs) const
{
@ -1061,9 +1036,6 @@ public:
/// Test for inequality with a variant vector.
bool operator !=(const VariantVector& rhs) const { return !(*this == rhs); }
/// Test for inequality with a variant map vector.
bool operator !=(const VariantMapVector& rhs) const { return !(*this == rhs); }
/// Test for inequality with a string vector.
bool operator !=(const StringVector& rhs) const { return !(*this == rhs); }
@ -1263,12 +1235,6 @@ public:
return type_ == VAR_VARIANTVECTOR ? value_.variantVector_ : emptyVariantVector;
}
/// Return a variant map vector or empty on type mismatch.
const VariantMapVector& GetVariantMapVector() const
{
return type_ == VAR_VARIANTMAPVECTOR ? value_.variantMapVector_ : emptyVariantMapVector;
}
/// Return a string vector or empty on type mismatch.
const StringVector& GetStringVector() const
{
@ -1392,9 +1358,6 @@ public:
/// Return a pointer to a modifiable variant vector or null on type mismatch.
VariantVector* GetVariantVectorPtr() { return type_ == VAR_VARIANTVECTOR ? &value_.variantVector_ : nullptr; }
/// Return a pointer to a modifiable variant vector or null on type mismatch.
VariantMapVector* GetVariantMapVectorPtr() { return type_ == VAR_VARIANTMAPVECTOR ? &value_.variantMapVector_ : nullptr; }
/// Return a pointer to a modifiable string vector or null on type mismatch.
StringVector* GetStringVectorPtr() { return type_ == VAR_STRINGVECTOR ? &value_.stringVector_ : nullptr; }
@ -1431,8 +1394,6 @@ public:
static const VariantMap emptyVariantMap;
/// Empty variant vector.
static const VariantVector emptyVariantVector;
/// Empty variant map vector.
static const VariantMapVector emptyVariantMapVector;
/// Empty string vector.
static const StringVector emptyStringVector;
@ -1486,8 +1447,6 @@ template <> inline VariantType GetVariantType<ResourceRefList>() { return VAR_RE
template <> inline VariantType GetVariantType<VariantVector>() { return VAR_VARIANTVECTOR; }
template <> inline VariantType GetVariantType<VariantMapVector>() { return VAR_VARIANTMAPVECTOR; }
template <> inline VariantType GetVariantType<StringVector>() { return VAR_STRINGVECTOR; }
template <> inline VariantType GetVariantType<VariantMap>() { return VAR_VARIANTMAP; }
@ -1561,8 +1520,6 @@ template <> URHO3D_API ResourceRefList Variant::Get<ResourceRefList>() const;
template <> URHO3D_API VariantVector Variant::Get<VariantVector>() const;
template <> URHO3D_API VariantMapVector Variant::Get<VariantMapVector>() const;
template <> URHO3D_API StringVector Variant::Get<StringVector>() const;
template <> URHO3D_API VariantMap Variant::Get<VariantMap>() const;