common: replace container_of with a C++ safe implementation

[lttng-tools.git] / src / common / evaluation.cpp

diff --git a/src/common/evaluation.cpp b/src/common/evaluation.cpp
index 6b3e634947253812329f099770d2345f999622b1..e6ebeec8e2680b07ef37850847bd67ff62281630 100644 (file)
--- 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,
@@ -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;