X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fdispatch.cpp;h=82bf1c2d3128a026a0d8eb62b18eb9a4b2e70353;hb=6d31b87d46a9301fe86d273616ab3d7214d24e65;hp=89d7c7c2e0d1fb894b02f10d7b17223ebbef9bee;hpb=64803277bbdbe0a943360d918298a48157d9da55;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/dispatch.cpp b/src/bin/lttng-sessiond/dispatch.cpp
index 89d7c7c2e..82bf1c2d3 100644
--- a/src/bin/lttng-sessiond/dispatch.cpp
+++ b/src/bin/lttng-sessiond/dispatch.cpp
@@ -21,12 +21,14 @@
 #include "lttng-sessiond.hpp"
 #include "thread.hpp"
 
+namespace {
 struct thread_notifiers {
 	struct ust_cmd_queue *ust_cmd_queue;
 	int apps_cmd_pipe_write_fd;
 	int apps_cmd_notify_pipe_write_fd;
 	int dispatch_thread_exit;
 };
+} /* namespace */
 
 /*
  * For each tracing session, update newly registered apps. The session list
@@ -282,7 +284,7 @@ static void *thread_dispatch_ust_registration(void *data)
 				break;
 			}
 
-			ust_cmd = caa_container_of(node, struct ust_command, node);
+			ust_cmd = lttng::utils::container_of(node, &ust_command::node);
 
 			DBG("Dispatching UST registration pid:%d ppid:%d uid:%d"
 					" gid:%d sock:%d name:%s (version %d.%d)",
@@ -474,7 +476,7 @@ error:
 		if (node == NULL) {
 			break;
 		}
-		ust_cmd = caa_container_of(node, struct ust_command, node);
+		ust_cmd = lttng::utils::container_of(node, &ust_command::node);
 		ret = close(ust_cmd->sock);
 		if (ret < 0) {
 			PERROR("close ust sock exit dispatch %d", ust_cmd->sock);