Build fix: missing initializer for member 'rotation_positions'

[lttng-tools.git] / src / bin / lttng-relayd / viewer-stream.cpp

diff --git a/src/bin/lttng-relayd/viewer-stream.cpp b/src/bin/lttng-relayd/viewer-stream.cpp
index 69671bd7af4552ae6eb1803654692265a1c30cd3..f37d8e33040d991d7ea3ecd818508d1d9ac1f3f2 100644 (file)
--- a/src/bin/lttng-relayd/viewer-stream.cpp
+++ b/src/bin/lttng-relayd/viewer-stream.cpp
@@ -8,17 +8,17 @@
  */
 
 #define _LGPL_SOURCE
-#include <common/common.h>
-#include <common/index/index.h>
-#include <common/compat/string.h>
-#include <common/utils.h>
+#include <common/common.hpp>
+#include <common/index/index.hpp>
+#include <common/compat/string.hpp>
+#include <common/utils.hpp>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <algorithm>
 
-#include "lttng-relayd.h"
-#include "viewer-stream.h"
+#include "lttng-relayd.hpp"
+#include "viewer-stream.hpp"
 
 static void viewer_stream_release_composite_objects(struct relay_viewer_stream *vstream)
 {
@@ -48,7 +48,7 @@ static void viewer_stream_destroy(struct relay_viewer_stream *vstream)
 static void viewer_stream_destroy_rcu(struct rcu_head *head)
 {
        struct relay_viewer_stream *vstream =
-               caa_container_of(head, struct relay_viewer_stream, rcu_node);
+               lttng::utils::container_of(head, &relay_viewer_stream::rcu_node);
 
        viewer_stream_destroy(vstream);
 }
@@ -62,7 +62,7 @@ struct relay_viewer_stream *viewer_stream_create(struct relay_stream *stream,
 
        ASSERT_LOCKED(stream->lock);
 
-       vstream = (relay_viewer_stream *) zmalloc(sizeof(*vstream));
+       vstream = zmalloc<relay_viewer_stream>();
        if (!vstream) {
                PERROR("relay viewer stream zmalloc");
                goto error;
@@ -269,7 +269,7 @@ struct relay_viewer_stream *viewer_stream_get_by_id(uint64_t id)
                DBG("Relay viewer stream %" PRIu64 " not found", id);
                goto end;
        }
-       vstream = caa_container_of(node, struct relay_viewer_stream, stream_n);
+       vstream = lttng::utils::container_of(node, &relay_viewer_stream::stream_n);
        if (!viewer_stream_get(vstream)) {
                vstream = NULL;
        }