X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconditions%2Fevent-rule-matches.cpp;h=0a926755ecee1eef537805e89604ed8810c38f08;hb=64803277bbdbe0a943360d918298a48157d9da55;hp=3e7776f46cbd5d5449cfed4af2482a7d83031bdc;hpb=a6bc4ca9d659caf016ef932fcd944029737ac57c;p=lttng-tools.git

diff --git a/src/common/conditions/event-rule-matches.cpp b/src/common/conditions/event-rule-matches.cpp
index 3e7776f46..0a926755e 100644
--- a/src/common/conditions/event-rule-matches.cpp
+++ b/src/common/conditions/event-rule-matches.cpp
@@ -5,18 +5,18 @@
  *
  */
 
-#include <common/error.h>
-#include <common/macros.h>
-#include <common/mi-lttng.h>
+#include <common/error.hpp>
+#include <common/macros.hpp>
+#include <common/mi-lttng.hpp>
 #include <inttypes.h>
 #include <limits.h>
-#include <lttng/condition/condition-internal.h>
-#include <lttng/condition/event-rule-matches-internal.h>
+#include <lttng/condition/condition-internal.hpp>
+#include <lttng/condition/event-rule-matches-internal.hpp>
 #include <lttng/condition/event-rule-matches.h>
-#include <lttng/event-expr-internal.h>
+#include <lttng/event-expr-internal.hpp>
 #include <lttng/event-expr.h>
-#include <lttng/event-field-value-internal.h>
-#include <lttng/event-rule/event-rule-internal.h>
+#include <lttng/event-field-value-internal.hpp>
+#include <lttng/event-rule/event-rule-internal.hpp>
 #include <lttng/lttng-error.h>
 #include <stdbool.h>
 #include <stdint.h>
@@ -518,7 +518,7 @@ struct lttng_condition *lttng_condition_event_rule_matches_create(
 		goto end;
 	}
 
-	condition = (lttng_condition_event_rule_matches *) zmalloc(sizeof(struct lttng_condition_event_rule_matches));
+	condition = zmalloc<lttng_condition_event_rule_matches>();
 	if (!condition) {
 		return NULL;
 	}
@@ -889,7 +889,7 @@ lttng_condition_event_rule_matches_append_capture_descriptor(
 		goto end;
 	}
 
-	descriptor = (lttng_capture_descriptor *) malloc(sizeof(*descriptor));
+	descriptor = malloc<lttng_capture_descriptor>();
 	if (descriptor == NULL) {
 		status = LTTNG_CONDITION_STATUS_ERROR;
 		goto end;
@@ -1385,7 +1385,7 @@ struct lttng_evaluation *lttng_evaluation_event_rule_matches_create(
 	struct lttng_evaluation_event_rule_matches *hit;
 	struct lttng_evaluation *evaluation = NULL;
 
-	hit = (lttng_evaluation_event_rule_matches *) zmalloc(sizeof(struct lttng_evaluation_event_rule_matches));
+	hit = zmalloc<lttng_evaluation_event_rule_matches>();
 	if (!hit) {
 		goto error;
 	}