common: replace container_of with a C++ safe implementation

[lttng-tools.git] / src / bin / lttng-sessiond / ust-registry.cpp

diff --git a/src/bin/lttng-sessiond/ust-registry.cpp b/src/bin/lttng-sessiond/ust-registry.cpp
index 323fdd6a757b82a0a6938adec9bb41cb1d520e25..2a7d6217a501b605eca4dd50c763b3d94025f5e7 100644 (file)
--- a/src/bin/lttng-sessiond/ust-registry.cpp
+++ b/src/bin/lttng-sessiond/ust-registry.cpp
@@ -33,11 +33,11 @@ namespace lsu = lttng::sessiond::ust;
  */
 static void ust_registry_event_destroy_rcu(struct rcu_head *head)
 {
-       struct lttng_ht_node_u64 *node = caa_container_of(head, struct lttng_ht_node_u64, head);
+       struct lttng_ht_node_u64 *node = lttng::utils::container_of(head, &lttng_ht_node_u64::head);
        DIAGNOSTIC_PUSH
        DIAGNOSTIC_IGNORE_INVALID_OFFSETOF
        lttng::sessiond::ust::registry_event *event =
-                       caa_container_of(node, lttng::sessiond::ust::registry_event, _node);
+                       lttng::utils::container_of(node, &lttng::sessiond::ust::registry_event::_node);
        DIAGNOSTIC_POP
 
        lttng::sessiond::ust::registry_event_destroy(event);