X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fsession-descriptor.cpp;fp=src%2Fcommon%2Fsession-descriptor.cpp;h=1171b2930ce605c2ee465476cd5d4541cd48a646;hb=0114db0ec2407029052eb61a0189c9b1cd64d520;hp=642c6399fc6e7728693a2d27ff07326b9ded2432;hpb=3691d312bcf4dc2cc15f0ecb1f0e2fd2f34315b8;p=lttng-tools.git

diff --git a/src/common/session-descriptor.cpp b/src/common/session-descriptor.cpp
index 642c6399f..1171b2930 100644
--- a/src/common/session-descriptor.cpp
+++ b/src/common/session-descriptor.cpp
@@ -847,9 +847,8 @@ int lttng_session_descriptor_serialize(
 
 	header.base.uri_count = uri_count;
 	if (descriptor->type == LTTNG_SESSION_DESCRIPTOR_TYPE_LIVE) {
-		const struct lttng_session_descriptor_live *live =
-				container_of(descriptor, typeof(*live),
-				base);
+		const struct lttng_session_descriptor_live *live = lttng::utils::container_of(
+				descriptor, &lttng_session_descriptor_live::base);
 
 		header.live_timer_us = live->live_timer_us;
 		header_ptr = &header;
@@ -918,7 +917,7 @@ lttng_session_descriptor_live_get_timer_interval(
 {
 	struct lttng_session_descriptor_live *live;
 
-	live = container_of(descriptor, typeof(*live), base);
+	live = lttng::utils::container_of(descriptor, &lttng_session_descriptor_live::base);
 	return live->live_timer_us;
 }