Solve issues with ownership in cxx port.

Author: viferga

source/ports/cxx_port/CMakeLists.txt

@@ -177,3 +177,19 @@ target_link_options(${target}
 
 	INTERFACE
 )
+
+#
+# Deployment
+#
+
+# Header files
+install(DIRECTORY
+	${CMAKE_CURRENT_SOURCE_DIR}/include/${target} DESTINATION ${INSTALL_INCLUDE}
+	COMPONENT dev
+)
+
+# Inline files
+install(DIRECTORY
+	${CMAKE_CURRENT_SOURCE_DIR}/inline/${target} DESTINATION ${INSTALL_INCLUDE}
+	COMPONENT dev
+)

source/ports/cxx_port/include/metacall/metacall.hpp

@@ -53,11 +53,8 @@ class value_base
 protected:
 	std::unique_ptr<void, void (*)(void *)> value_ptr;
 
-	explicit value_base(void *value_ptr, void (*destructor)(void *) = &noop_destructor) :
-		// TODO: &metacall_value_destroy
-		value_ptr(value_ptr, destructor)
-	{
-	}
+	explicit value_base(void *value_ptr, void (*destructor)(void *) = &metacall_value_destroy) :
+		value_ptr(value_ptr, destructor) {}
 
 	static void noop_destructor(void *) {}
 };
@@ -66,8 +63,8 @@ template <typename T>
 class METACALL_API value : public value_base
 {
 public:
-	explicit value(const T &v) :
-		value_base(create(v))
+	explicit value(const T &v, void (*destructor)(void *) = &metacall_value_destroy) :
+		value_base(create(v), destructor)
 	{
 		if (value_ptr == nullptr)
 		{
@@ -365,7 +362,7 @@ class METACALL_API map : public value_base
 			void **tuple_array = metacall_value_to_array(tuple);
 
 			// Create the pair
-			auto value_pair = std::make_pair(value<K>(pair.first), value<V>(pair.second));
+			auto value_pair = std::make_pair(value<K>(pair.first, &value_base::noop_destructor), value<V>(pair.second, &value_base::noop_destructor));
 
 			// Insert into metacall value map
 			tuple_array[0] = value_pair.first.to_raw();

source/tests/metacall_cxx_port_test/source/metacall_cxx_port_test.cpp

@@ -46,6 +46,23 @@ void *cxx_map_test(size_t argc, void *args[], void *data)
 	return metacall_value_create_null();
 }
 
+void *cxx_recursive_map_test(size_t argc, void *args[], void *data)
+{
+	map<std::string, float> m(args[0]);
+
+	(void)argc;
+	(void)data;
+
+	EXPECT_EQ((float)m["hello"], (float)3.0f);
+	EXPECT_EQ((float)m["world"], (float)4.0f);
+
+	printf("hello => %f\n", m["hello"]);
+	printf("world => %f\n", m["world"]);
+	fflush(stdout);
+
+	return metacall_value_create_null();
+}
+
 TEST_F(metacall_cxx_port_test, DefaultConstructor)
 {
 	ASSERT_EQ((int)0, (int)metacall_initialize());
@@ -71,6 +88,28 @@ TEST_F(metacall_cxx_port_test, DefaultConstructor)
 		metacall_value_destroy(ret);
 	}
 
+	/*
+	{
+		map<std::string, map<std::string, float>> m = {
+			{ "hello", { "world", 4.0f } },
+		};
+
+		void *args[] = {
+			m.to_raw()
+		};
+
+		metacall_register("cxx_recursive_map_test", cxx_recursive_map_test, NULL, METACALL_NULL, 1, METACALL_MAP);
+
+		void *ret = metacallv_s("cxx_recursive_map_test", args, 1);
+
+		EXPECT_NE((void *)NULL, (void *)ret);
+
+		EXPECT_EQ((enum metacall_value_id)metacall_value_id(ret), (enum metacall_value_id)METACALL_NULL);
+
+		metacall_value_destroy(ret);
+	}
+	*/
+
 	/* Print inspect information */
 	{
 		size_t size = 0;