common: replace container_of with a C++ safe implementation

[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 2790903adb7962d706eeb8bb0e660b7229c17d26..f37d8e33040d991d7ea3ecd818508d1d9ac1f3f2 100644 (file)
--- a/src/bin/lttng-relayd/viewer-stream.cpp
+++ b/src/bin/lttng-relayd/viewer-stream.cpp
@@ -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);
 }
@@ -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;
        }