X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Fevaluation.cpp;h=2b57de62cbb5ab07c37cceb9e38bd63188390194;hb=9a30ba1da4e6d59eb30c6535a9dd04cd599e6fae;hp=a0fbc9dd905e1c247eedd3f16ae7837341158099;hpb=c9e313bc594f40a86eed237dce222c0fc99c957f;p=lttng-tools.git

diff --git a/src/common/evaluation.cpp b/src/common/evaluation.cpp
index a0fbc9dd9..2b57de62c 100644
--- a/src/common/evaluation.cpp
+++ b/src/common/evaluation.cpp
@@ -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;