X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Ffd-handle.cpp;h=8a0d95243bcdfebf4035da2981ff13cbaed454d9;hb=0114db0ec2407029052eb61a0189c9b1cd64d520;hp=d8b5b785d11679d25d045a08e4df0e93592c7072;hpb=a6bc4ca9d659caf016ef932fcd944029737ac57c;p=lttng-tools.git

diff --git a/src/common/fd-handle.cpp b/src/common/fd-handle.cpp
index d8b5b785d..8a0d95243 100644
--- a/src/common/fd-handle.cpp
+++ b/src/common/fd-handle.cpp
@@ -8,8 +8,8 @@
 #include <unistd.h>
 #include <urcu/ref.h>
 
-#include "fd-handle.h"
-#include <common/error.h>
+#include "fd-handle.hpp"
+#include <common/error.hpp>
 
 struct fd_handle {
 	struct urcu_ref ref;
@@ -19,7 +19,7 @@ struct fd_handle {
 static void fd_handle_release(struct urcu_ref *ref)
 {
 	int ret;
-	struct fd_handle *handle = container_of(ref, struct fd_handle, ref);
+	struct fd_handle *handle = lttng::utils::container_of(ref, &fd_handle::ref);
 
 	LTTNG_ASSERT(handle->fd >= 0);
 	ret = close(handle->fd);
@@ -41,7 +41,7 @@ struct fd_handle *fd_handle_create(int fd)
 		goto end;
 	}
 
-	handle = (fd_handle *) zmalloc(sizeof(*handle));
+	handle = zmalloc<fd_handle>();
 	if (!handle) {
 		PERROR("Failed to allocate fd_handle");
 		goto end;