adding move semantics

Author: eteran

lib/include/cpp-json/value.h

@@ -71,7 +71,7 @@ class value {
 	value(const std::nullptr_t &);
 
 public:
-	value();
+	value() = default;
 	~value();
 
 public:
@@ -80,7 +80,9 @@ class value {
 
 public:
 	value(const value &other);
+	value(value &&other);
 	value &operator=(const value &rhs);
+	value &operator=(value &&rhs);
 
 public:
 	void swap(value &other);
@@ -123,7 +125,7 @@ class value {
 	};
 
 	storage_type value_;
-	type         type_;
+	type         type_ = type_invalid;
 };
 
 bool operator==(const value &lhs, const value &rhs);

lib/include/cpp-json/value.tcc

@@ -28,13 +28,6 @@ inline value::~value() {
 	}
 }
 
-//------------------------------------------------------------------------------
-// Name: value
-//------------------------------------------------------------------------------
-inline value::value() : type_(type_invalid) {
-
-}
-
 //------------------------------------------------------------------------------
 // Name: value
 //------------------------------------------------------------------------------
@@ -92,6 +85,42 @@ inline value::value(bool b) : type_(type_boolean) {
 	new (&value_) std::string(b ? "true" : "false");
 }
 
+//------------------------------------------------------------------------------
+// Name: value
+//------------------------------------------------------------------------------
+inline value::value(value &&other) : type_(other.type_) {
+
+	other.type_ = type::type_invalid;
+
+	// move from the other object
+	switch(type_) {
+	case value::type_string:
+	case value::type_number:
+	case value::type_null:
+	case value::type_boolean:
+		new (&value_) std::string(std::move(*reinterpret_cast<std::string *>(&other.value_)));
+		break;
+	case value::type_array:
+		new (&value_) array_pointer(std::move(*reinterpret_cast<array_pointer *>(&other.value_)));
+		break;
+	case value::type_object:
+		new (&value_) object_pointer(std::move(*reinterpret_cast<object_pointer *>(&other.value_)));
+		break;
+	case value::type_invalid:
+		break;
+	}
+}
+
+//------------------------------------------------------------------------------
+// Name: operator=
+//------------------------------------------------------------------------------
+inline value &value::operator=(value &&rhs) {
+	if(this != &rhs) {
+		value(std::move(rhs)).swap(*this);
+	}
+	return *this;
+}
+
 //------------------------------------------------------------------------------
 // Name: value
 //------------------------------------------------------------------------------