Implement move for JsonValue

include/caosdb/utility.h

@@ -137,14 +137,14 @@ public:
    *
    * Also moves the `wrapped` object.
    */
-  JsonValue(JsonValue &&other) = default;
+  JsonValue(JsonValue &&other);
 
   /**
    * Move Assigment.
    *
    * Also moves the `wrapped` object.
    */
-  auto operator=(JsonValue &&other) -> JsonValue & = default;
+  auto operator=(JsonValue &&other) -> JsonValue &;
 
   /**
    * Return true if the `wrapped` object is the nullptr.

src/caosdb/utility.cpp

@@ -147,10 +147,11 @@ auto load_json_file(const path &json_file) -> JsonValue {
 JsonValue::~JsonValue() { this->Reset(); }
 
 auto JsonValue::Reset() -> void {
-  if (!IsNull()) {
-    delete static_cast<value *>(this->wrapped);
-  }
+  void * tmp = std::move(this->wrapped);
   this->wrapped = nullptr;
+  if (tmp != nullptr) {
+    delete static_cast<value *>(tmp);
+  }
 }
 
 JsonValue::JsonValue(const JsonValue &other) : wrapped(nullptr) {
@@ -169,4 +170,21 @@ auto JsonValue::operator=(const JsonValue &other) -> JsonValue & {
   return *this;
 }
 
+JsonValue::JsonValue(JsonValue &&other) : wrapped(nullptr) {
+  std::cout << "MoveConstructor" << std::endl;
+  if (!other.IsNull()) {
+    this->wrapped = other.wrapped;
+    other.wrapped = nullptr;
+  }
+}
+
+auto JsonValue::operator=(JsonValue &&other) -> JsonValue & {
+  std::cout << "MoveAssignment" << std::endl;
+  if (this != &other) {
+    this->wrapped = other.wrapped;
+    other.wrapped = nullptr;
+  }
+  return *this;
+}
+
 } // namespace caosdb::utility