X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Ftrigger.cpp;h=161c1abee7654f4ad5a00852f8e5fd53c2353302;hb=0114db0ec2407029052eb61a0189c9b1cd64d520;hp=be2c49b7cd3d79a03dc61eb1ed12e90c23321825;hpb=c9e313bc594f40a86eed237dce222c0fc99c957f;p=lttng-tools.git

diff --git a/src/common/trigger.cpp b/src/common/trigger.cpp
index be2c49b7c..161c1abee 100644
--- a/src/common/trigger.cpp
+++ b/src/common/trigger.cpp
@@ -55,7 +55,7 @@ struct lttng_trigger *lttng_trigger_create(
 		goto end;
 	}
 
-	trigger = (lttng_trigger *) zmalloc(sizeof(struct lttng_trigger));
+	trigger = zmalloc<lttng_trigger>();
 	if (!trigger) {
 		goto end;
 	}
@@ -112,7 +112,7 @@ const struct lttng_action *lttng_trigger_get_const_action(
 static void trigger_destroy_ref(struct urcu_ref *ref)
 {
 	struct lttng_trigger *trigger =
-			container_of(ref, struct lttng_trigger, ref);
+			lttng::utils::container_of(ref, &lttng_trigger::ref);
 	struct lttng_action *action = lttng_trigger_get_action(trigger);
 	struct lttng_condition *condition =
 			lttng_trigger_get_condition(trigger);
@@ -505,7 +505,7 @@ struct lttng_triggers *lttng_triggers_create(void)
 {
 	struct lttng_triggers *triggers = NULL;
 
-	triggers = (lttng_triggers *) zmalloc(sizeof(*triggers));
+	triggers = zmalloc<lttng_triggers>();
 	if (!triggers) {
 		goto end;
 	}