VS2013 doesn't allow move ops to be =default

SongZxx · Mar 1, 2019 · 00558b3 · 00558b3
1 parent 433107f
commit 00558b3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/include/json/value.h b/include/json/value.h
@@ -659,9 +659,9 @@ Json::Value obj_value(Json::objectValue); // {}
   public:
     Comments() = default;
     Comments(const Comments& that);
-    Comments(Comments&&) = default;
+    Comments(Comments&& that);
     Comments& operator=(const Comments& that);
-    Comments& operator=(Comments&&) = default;
+    Comments& operator=(Comments&& that);
     bool has(CommentPlacement slot) const;
     String get(CommentPlacement slot) const;
     void set(CommentPlacement slot, String s);

diff --git a/src/lib_json/json_value.cpp b/src/lib_json/json_value.cpp
@@ -1440,11 +1440,19 @@ bool Value::isObject() const { return type() == objectValue; }
 Value::Comments::Comments(const Comments& that)
     : ptr_{cloneUnique(that.ptr_)} {}
 
+Value::Comments::Comments(Comments&& that)
+    : ptr_{std::move(that.ptr_)} {}
+
 Value::Comments& Value::Comments::operator=(const Comments& that) {
   ptr_ = cloneUnique(that.ptr_);
   return *this;
 }
 
+Value::Comments& Value::Comments::operator=(Comments&& that) {
+  ptr_ = std::move(that.ptr_);
+  return *this;
+}
+
 bool Value::Comments::has(CommentPlacement slot) const {
   return ptr_ && !(*ptr_)[slot].empty();
 }