i think move semantics are starting to look right

Author: eteran

lib/include/cpp-json/value.h

@@ -112,6 +112,9 @@ class value {
 	const array &as_array() const;
 	array &as_array();
 
+private:
+	void destroy();
+
 private:
 	struct invalid_t {};
 

lib/include/cpp-json/value.tcc

@@ -8,6 +8,13 @@ namespace json {
 // Name: ~value
 //------------------------------------------------------------------------------
 inline value::~value() {
+	destroy();
+}
+
+//------------------------------------------------------------------------------
+// Name: ~value
+//------------------------------------------------------------------------------
+inline void value::destroy() {
 	using std::string;
 
 	switch(type_) {
@@ -26,6 +33,8 @@ inline value::~value() {
 	case value::type_invalid:
 		break;
 	}
+
+	type_ = type_invalid;
 }
 
 //------------------------------------------------------------------------------
@@ -90,7 +99,7 @@ inline value::value(bool b) : type_(type_boolean) {
 //------------------------------------------------------------------------------
 inline value::value(value &&other) : type_(other.type_) {
 
-	other.type_ = type::type_invalid;
+	using std::string;
 
 	// move from the other object
 	switch(type_) {
@@ -109,6 +118,8 @@ inline value::value(value &&other) : type_(other.type_) {
 	case value::type_invalid:
 		break;
 	}
+
+	other.destroy();
 }
 
 //------------------------------------------------------------------------------

test/CMakeLists.txt

@@ -5,10 +5,10 @@ add_executable(example2 example2.cpp)
 add_executable(example3 example3.cpp)
 add_executable(example4 example4.cpp)
 
-target_link_libraries(example1 LINK_PUBLIC cpp-json)
-target_link_libraries(example2 LINK_PUBLIC cpp-json)
-target_link_libraries(example3 LINK_PUBLIC cpp-json)
-target_link_libraries(example4 LINK_PUBLIC cpp-json)
+target_link_libraries(example1 PUBLIC cpp-json)
+target_link_libraries(example2 PUBLIC cpp-json)
+target_link_libraries(example3 PUBLIC cpp-json)
+target_link_libraries(example4 PUBLIC cpp-json)
 
 set_property(TARGET example1 PROPERTY CXX_STANDARD 11)
 set_property(TARGET example2 PROPERTY CXX_STANDARD 11)