X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fevaluation.cpp;h=2b57de62cbb5ab07c37cceb9e38bd63188390194;hb=7d1f4920efe33a4d025b9ba632ffbe73557d9636;hp=6b3e634947253812329f099770d2345f999622b1;hpb=a6bc4ca9d659caf016ef932fcd944029737ac57c;p=lttng-tools.git

diff --git a/src/common/evaluation.cpp b/src/common/evaluation.cpp
index 6b3e63494..2b57de62c 100644
--- a/src/common/evaluation.cpp
+++ b/src/common/evaluation.cpp
@@ -5,14 +5,14 @@
  *
  */
 
-#include <lttng/condition/condition-internal.h>
-#include <lttng/condition/evaluation-internal.h>
-#include <lttng/condition/buffer-usage-internal.h>
-#include <lttng/condition/session-consumed-size-internal.h>
-#include <lttng/condition/session-rotation-internal.h>
-#include <lttng/condition/event-rule-matches-internal.h>
-#include <common/macros.h>
-#include <common/error.h>
+#include <lttng/condition/condition-internal.hpp>
+#include <lttng/condition/evaluation-internal.hpp>
+#include <lttng/condition/buffer-usage-internal.hpp>
+#include <lttng/condition/session-consumed-size-internal.hpp>
+#include <lttng/condition/session-rotation-internal.hpp>
+#include <lttng/condition/event-rule-matches-internal.hpp>
+#include <common/macros.hpp>
+#include <common/error.hpp>
 #include <stdbool.h>
 
 void lttng_evaluation_init(struct lttng_evaluation *evaluation,
@@ -25,9 +25,9 @@ int lttng_evaluation_serialize(const struct lttng_evaluation *evaluation,
 		struct lttng_payload *payload)
 {
 	int ret;
-	struct lttng_evaluation_comm evaluation_comm = {
-		.type = (int8_t) evaluation->type
-	};
+	struct lttng_evaluation_comm evaluation_comm;
+
+	evaluation_comm.type = (int8_t) evaluation->type;
 
 	ret = lttng_dynamic_buffer_append(&payload->buffer, &evaluation_comm,
 			sizeof(evaluation_comm));
@@ -118,9 +118,8 @@ ssize_t lttng_evaluation_create_from_payload(
 		LTTNG_ASSERT(condition->type ==
 				LTTNG_CONDITION_TYPE_EVENT_RULE_MATCHES);
 		ret = lttng_evaluation_event_rule_matches_create_from_payload(
-				container_of(condition,
-						const struct lttng_condition_event_rule_matches,
-						parent),
+				lttng::utils::container_of(condition,
+						&lttng_condition_event_rule_matches::parent),
 				&evaluation_view, evaluation);
 		if (ret < 0) {
 			goto end;