common: replace container_of with a C++ safe implementation

[lttng-tools.git] / src / common / actions / action.cpp

diff --git a/src/common/actions/action.cpp b/src/common/actions/action.cpp
index b71538b3f477d10a4dbf9b8de29d97ebf289edd3..bc9e3580a769632f6f09000eb05318d84501bc24 100644 (file)
--- a/src/common/actions/action.cpp
+++ b/src/common/actions/action.cpp
@@ -5,17 +5,17 @@
  *
  */
 
-#include <common/error.h>
-#include <common/mi-lttng.h>
-#include <lttng/action/action-internal.h>
-#include <lttng/action/list-internal.h>
-#include <lttng/action/notify-internal.h>
-#include <lttng/action/rate-policy-internal.h>
-#include <lttng/action/rotate-session-internal.h>
-#include <lttng/action/snapshot-session-internal.h>
-#include <lttng/action/start-session-internal.h>
-#include <lttng/action/stop-session-internal.h>
-#include <lttng/error-query-internal.h>
+#include <common/error.hpp>
+#include <common/mi-lttng.hpp>
+#include <lttng/action/action-internal.hpp>
+#include <lttng/action/list-internal.hpp>
+#include <lttng/action/notify-internal.hpp>
+#include <lttng/action/rate-policy-internal.hpp>
+#include <lttng/action/rotate-session-internal.hpp>
+#include <lttng/action/snapshot-session-internal.hpp>
+#include <lttng/action/start-session-internal.hpp>
+#include <lttng/action/stop-session-internal.hpp>
+#include <lttng/error-query-internal.hpp>
 
 const char *lttng_action_type_string(enum lttng_action_type action_type)
 {
@@ -73,7 +73,7 @@ static
 void action_destroy_ref(struct urcu_ref *ref)
 {
        struct lttng_action *action =
-                       container_of(ref, struct lttng_action, ref);
+                       lttng::utils::container_of(ref, &lttng_action::ref);
 
        action->destroy(action);
 }