common: replace container_of with a C++ safe implementation

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

diff --git a/src/bin/lttng-relayd/stream.cpp b/src/bin/lttng-relayd/stream.cpp
index 9f7bfcb15bb513229118302765c8c8f2655f7f91..fbecdc55804acdc151732a17188b13fa1b969186 100644 (file)
--- a/src/bin/lttng-relayd/stream.cpp
+++ b/src/bin/lttng-relayd/stream.cpp
@@ -54,7 +54,7 @@ struct relay_stream *stream_get_by_id(uint64_t stream_id)
                DBG("Relay stream %" PRIu64 " not found", stream_id);
                goto end;
        }
                DBG("Relay stream %" PRIu64 " not found", stream_id);
                goto end;
        }

-       stream = caa_container_of(node, struct relay_stream, node);
+       stream = lttng::utils::container_of(node, &relay_stream::node);

        if (!stream_get(stream)) {
                stream = NULL;
        }
        if (!stream_get(stream)) {
                stream = NULL;
        }


@@ -760,7 +760,7 @@ static void stream_destroy(struct relay_stream *stream)
 static void stream_destroy_rcu(struct rcu_head *rcu_head)
 {
        struct relay_stream *stream =
 static void stream_destroy_rcu(struct rcu_head *rcu_head)
 {
        struct relay_stream *stream =

-               caa_container_of(rcu_head, struct relay_stream, rcu_node);
+               lttng::utils::container_of(rcu_head, &relay_stream::rcu_node);

 
        stream_destroy(stream);
 }
 
        stream_destroy(stream);
 }


@@ -772,7 +772,7 @@ static void stream_destroy_rcu(struct rcu_head *rcu_head)
 static void stream_release(struct urcu_ref *ref)
 {
        struct relay_stream *stream =
 static void stream_release(struct urcu_ref *ref)
 {
        struct relay_stream *stream =

-               caa_container_of(ref, struct relay_stream, ref);
+               lttng::utils::container_of(ref, &relay_stream::ref);

        struct relay_session *session;
 
        session = stream->trace->session;
        struct relay_session *session;
 
        session = stream->trace->session;