X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Flocation.cpp;h=b09430d617e408f76a88c041bc6fc1d5f96c8cf4;hb=f4d2c26adb8b6d18a62ca6d35e3a0529ff8a87b5;hp=7e6ea79b0aac8baa6082ff5f06869e7771bac670;hpb=c9e313bc594f40a86eed237dce222c0fc99c957f;p=lttng-tools.git

diff --git a/src/common/location.cpp b/src/common/location.cpp
index 7e6ea79b0..b09430d61 100644
--- a/src/common/location.cpp
+++ b/src/common/location.cpp
@@ -16,7 +16,7 @@ struct lttng_trace_archive_location *lttng_trace_archive_location_create(
 {
 	struct lttng_trace_archive_location *location;
 
-	location = (lttng_trace_archive_location *) zmalloc(sizeof(*location));
+	location = zmalloc<lttng_trace_archive_location>();
 	if (!location) {
 		goto end;
 	}
@@ -31,7 +31,7 @@ static
 void trace_archive_location_destroy_ref(struct urcu_ref *ref)
 {
 	struct lttng_trace_archive_location *location =
-			container_of(ref, struct lttng_trace_archive_location, ref);
+			lttng::utils::container_of(ref, &lttng_trace_archive_location::ref);
 
 	switch (location->type) {
 	case LTTNG_TRACE_ARCHIVE_LOCATION_TYPE_LOCAL: