Fix non-rvalue Json::Value assignment operator (should copy, not move)

Александр Малинин · Александр Малинин · commit 6a15ca64429e · 2017-07-31T15:29:02.000+03:00
diff --git a/include/json/value.h b/include/json/value.h
@@ -327,10 +327,7 @@ Json::Value obj_value(Json::objectValue); // {}
 
   /// Deep copy, then swap(other).
   /// \note Over-write existing comments. To preserve comments, use #swapPayload().
-  Value& operator=(const Value& other);
-#if JSON_HAS_RVALUE_REFERENCES
-  Value& operator=(Value&& other);
-#endif
+  Value& operator=(Value other);
 
   /// Swap everything.
   void swap(Value& other);
diff --git a/src/lib_json/json_value.cpp b/src/lib_json/json_value.cpp
@@ -518,18 +518,10 @@ Value::~Value() {
   value_.uint_ = 0;
 }
 
-Value& Value::operator=(const Value& other) {
-  swap(const_cast<Value&>(other));
-  return *this;
-}
-
-#if JSON_HAS_RVALUE_REFERENCES
-Value& Value::operator=(Value&& other) {
-  initBasic(nullValue);
+Value& Value::operator=(Value other) {
   swap(other);
   return *this;
 }
-#endif
 
 void Value::swapPayload(Value& other) {
   ValueType temp = type_;
