From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Mon, 22 Jul 2024 20:05:35 +0000 (+0000)
Subject: sessiond: ust_app_channel: use lttng::utils::container_of
X-Git-Url: http://git.lttng.org./?a=commitdiff_plain;h=ec2e64a06f9b02626a38bd9140e4185ed3628b11;p=lttng-tools.git

sessiond: ust_app_channel: use lttng::utils::container_of

caa_container_of makes use of offsetof which is conditionally
supported for non-POD types. Replace its use by
lttng::utils::container_of.

Change-Id: I29980d41d068b29a41f8148188d66a636ea5b46f
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/bin/lttng-sessiond/ust-app.cpp b/src/bin/lttng-sessiond/ust-app.cpp
index c1de875eb..e60155d84 100644
--- a/src/bin/lttng-sessiond/ust-app.cpp
+++ b/src/bin/lttng-sessiond/ust-app.cpp
@@ -5876,7 +5876,7 @@ static int find_or_create_ust_app_channel(struct ltt_ust_session *usess,
 	lttng_ht_lookup(ua_sess->channels, (void *) uchan->name, &iter);
 	ua_chan_node = lttng_ht_iter_get_node<lttng_ht_node_str>(&iter);
 	if (ua_chan_node) {
-		*ua_chan = caa_container_of(ua_chan_node, struct ust_app_channel, node);
+		*ua_chan = lttng::utils::container_of(ua_chan_node, &ust_app_channel::node);
 		goto end;
 	}