X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-metadata.cpp;h=b507f7870e687841abe139c17b1a805b42c97612;hb=8957eb485bb4d777f075109f6c658b842352aa68;hp=6028527c5ed27cbdb4cd7a0c885b4944b211fb0d;hpb=d22ad5f818289bb10faa814c2ecef071ec0c2c67;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-metadata.cpp b/src/bin/lttng-sessiond/ust-metadata.cpp
index 6028527c5..b507f7870 100644
--- a/src/bin/lttng-sessiond/ust-metadata.cpp
+++ b/src/bin/lttng-sessiond/ust-metadata.cpp
@@ -13,16 +13,12 @@
 #include <limits.h>
 #include <unistd.h>
 #include <inttypes.h>
-#include <common/common.h>
-#include <common/time.h>
+#include <common/common.hpp>
+#include <common/time.hpp>
 
-#include "ust-registry.h"
-#include "ust-clock.h"
-#include "ust-app.h"
-
-#ifndef max_t
-#define max_t(type, a, b)	((type) ((a) > (b) ? (a) : (b)))
-#endif
+#include "ust-registry.hpp"
+#include "ust-clock.hpp"
+#include "ust-app.hpp"
 
 #define NR_CLOCK_OFFSET_SAMPLES		10
 
@@ -69,7 +65,7 @@ ssize_t metadata_reserve(struct ust_registry_session *session, size_t len)
 		char *newptr;
 
 		new_alloc_len =
-			max_t(size_t, 1U << get_count_order(new_alloc_len), old_alloc_len << 1);
+			std::max<size_t>(1U << get_count_order(new_alloc_len), old_alloc_len << 1);
 		newptr = (char *) realloc(session->metadata, new_alloc_len);
 		if (!newptr)
 			return -ENOMEM;
@@ -369,10 +365,6 @@ int _lttng_variant_statedump(struct ust_registry_session *session,
 	int ret;
 	char identifier[LTTNG_UST_ABI_SYM_NAME_LEN];
 
-	if (variant->type.atype != lttng_ust_ctl_atype_variant) {
-		ret = -EINVAL;
-		goto end;
-	}
 	(*iter_field)++;
 	sanitize_ctf_identifier(identifier, tag_name);
 	if (alignment) {