Добавил семантику перемещения для JSONValue

urho3d · Dec 7, 2022 · 07ac2f9 · 07ac2f9
1 parent 5d6703b
commit 07ac2f9
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/Source/Urho3D/Resource/JSONValue.cpp b/Source/Urho3D/Resource/JSONValue.cpp
@@ -602,6 +602,17 @@ VariantVector JSONValue::GetVariantVector() const
     return variantVector;
 }
 
+void JSONValue::Swap(JSONValue& other)
+{
+    unsigned t = type_;
+    type_ = other.type_;
+    other.type_ = t;
+
+    double n = numberValue_;
+    numberValue_ = other.numberValue_;
+    other.numberValue_ = n;
+}
+
 String JSONValue::GetValueTypeName(JSONValueType type)
 {
     return valueTypeNames[type];

diff --git a/Source/Urho3D/Resource/JSONValue.h b/Source/Urho3D/Resource/JSONValue.h
@@ -132,6 +132,13 @@ class URHO3D_API JSONValue
     {
         *this = value;
     }
+    /// Move-construct from another JSON value.
+    /// @nobind
+    JSONValue(JSONValue&& value)
+        : type_(0)
+    {
+        Swap(value);
+    }
     /// Destruct.
     ~JSONValue()
     {
@@ -158,6 +165,9 @@ class URHO3D_API JSONValue
     JSONValue& operator =(const JSONObject& rhs);
     /// Assign from another JSON value.
     JSONValue& operator =(const JSONValue& rhs);
+    /// Move from another JSON value.
+    /// @nobind
+    JSONValue& operator=(JSONValue&& rhs) { Swap(rhs); return *this; }
 
     /// Return value type.
     /// @property
@@ -273,6 +283,8 @@ class URHO3D_API JSONValue
     void SetVariantVector(const VariantVector& variantVector, Context* context = nullptr);
     /// Return a variant vector.
     VariantVector GetVariantVector() const;
+    /// Swap content of two values
+    void Swap(JSONValue& other);
 
     /// Empty JSON value.
     static const JSONValue EMPTY;