Merge branch 'lukeshu/better-cpp'

3 files changed, 11 insertions, 2 deletions

diff --git a/libmisc/tests/test_macro.c b/libmisc/tests/test_macro.c
index 5157820..6810005 100644
--- a/libmisc/tests/test_macro.c
+++ b/libmisc/tests/test_macro.c
@@ -178,5 +178,14 @@ int main() {
 		free(act_suffix);
 	}
 
+	printf("== LM_DEFAPPEND ===========================================\n");
+	LM_DEFAPPEND(mylist, a);
+	LM_DEFAPPEND(mylist,
+	             b);
+	{
+		const char *str = LM_STR_(mylist);
+		test_assert(strcmp(str, "a b") == 0);
+	}
+
 	return 0;
 }
diff --git a/libmisc/tests/test_obj.c b/libmisc/tests/test_obj.c
index 687ad4e..a13b8c9 100644
--- a/libmisc/tests/test_obj.c
+++ b/libmisc/tests/test_obj.c
@@ -53,7 +53,7 @@ int main() {
 	struct myclass obj = {
 		.a = MAGIC1,
 	};
-	lo_interface frobber iface = lo_box_myclass_as_frobber(&obj);
+	lo_interface frobber iface = LO_BOX(frobber, &obj);
 	test_assert(LO_CALL(iface, frob) == MAGIC1);
 	test_assert(LO_CALL(iface, frob1, MAGIC2) == MAGIC2);
 	LO_CALL(iface, frob0);
diff --git a/libmisc/tests/test_obj_nest.c b/libmisc/tests/test_obj_nest.c
index d5e563e..ba5ac37 100644
--- a/libmisc/tests/test_obj_nest.c
+++ b/libmisc/tests/test_obj_nest.c
@@ -64,7 +64,7 @@ static ssize_t myclass_write(struct myclass *self, void *buf, size_t count) {
 
 int main() {
 	struct myclass _obj = {};
-	lo_interface read_writer obj = lo_box_myclass_as_read_writer(&_obj);
+	lo_interface read_writer obj = LO_BOX(read_writer, &_obj);
 	test_assert(LO_CALL(obj, write, "Hello", 6) == 6);
 	char buf[6] = {};
 	test_assert(LO_CALL(obj, read, buf, 3) == 3);