common: replace container_of with a C++ safe implementation

[lttng-tools.git] / src / common / conditions / condition.cpp

diff --git a/src/common/conditions/condition.cpp b/src/common/conditions/condition.cpp
index 18b756dce4c489e2a88f8ef318c366c03c41ce2e..1efab164d8c39610b509c32a1e898cf041836623 100644 (file)
--- a/src/common/conditions/condition.cpp
+++ b/src/common/conditions/condition.cpp
@@ -5,17 +5,17 @@
  *
  */
 
-#include <common/buffer-view.h>
-#include <common/dynamic-buffer.h>
-#include <common/error.h>
-#include <common/macros.h>
-#include <common/mi-lttng.h>
-#include <lttng/condition/buffer-usage-internal.h>
-#include <lttng/condition/condition-internal.h>
-#include <lttng/condition/event-rule-matches-internal.h>
-#include <lttng/condition/session-consumed-size-internal.h>
-#include <lttng/condition/session-rotation-internal.h>
-#include <lttng/error-query-internal.h>
+#include <common/buffer-view.hpp>
+#include <common/dynamic-buffer.hpp>
+#include <common/error.hpp>
+#include <common/macros.hpp>
+#include <common/mi-lttng.hpp>
+#include <lttng/condition/buffer-usage-internal.hpp>
+#include <lttng/condition/condition-internal.hpp>
+#include <lttng/condition/event-rule-matches-internal.hpp>
+#include <lttng/condition/session-consumed-size-internal.hpp>
+#include <lttng/condition/session-rotation-internal.hpp>
+#include <lttng/error-query-internal.hpp>
 #include <stdbool.h>
 
 enum lttng_condition_type lttng_condition_get_type(
@@ -32,7 +32,7 @@ void lttng_condition_destroy(struct lttng_condition *condition)
 static void condition_destroy_ref(struct urcu_ref *ref)
 {
        struct lttng_condition *condition =
-               container_of(ref, struct lttng_condition, ref);
+               lttng::utils::container_of(ref, &lttng_condition::ref);
 
        condition->destroy(condition);
 }