X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcommon%2Ferror-query.cpp;h=b299966515dd4175e75f19aa5bce56eb74593940;hb=c9e313bc594f40a86eed237dce222c0fc99c957f;hp=5d369c9e07563bfdba794694b69b22e1c74bb9a0;hpb=a6bc4ca9d659caf016ef932fcd944029737ac57c;p=lttng-tools.git

diff --git a/src/common/error-query.cpp b/src/common/error-query.cpp
index 5d369c9e0..b29996651 100644
--- a/src/common/error-query.cpp
+++ b/src/common/error-query.cpp
@@ -7,17 +7,17 @@
  *
  */
 
-#include <common/dynamic-array.h>
-#include <common/error.h>
-#include <common/macros.h>
-#include <common/mi-lttng.h>
-#include <common/sessiond-comm/sessiond-comm.h>
-#include <lttng/action/action-internal.h>
-#include <lttng/action/list-internal.h>
-#include <lttng/action/path-internal.h>
-#include <lttng/error-query-internal.h>
+#include <common/dynamic-array.hpp>
+#include <common/error.hpp>
+#include <common/macros.hpp>
+#include <common/mi-lttng.hpp>
+#include <common/sessiond-comm/sessiond-comm.hpp>
+#include <lttng/action/action-internal.hpp>
+#include <lttng/action/list-internal.hpp>
+#include <lttng/action/path-internal.hpp>
+#include <lttng/error-query-internal.hpp>
 #include <lttng/error-query.h>
-#include <lttng/trigger/trigger-internal.h>
+#include <lttng/trigger/trigger-internal.hpp>
 #include <stddef.h>
 
 struct lttng_error_query {
@@ -536,7 +536,7 @@ int lttng_error_query_results_serialize(
 	const size_t result_count = lttng_dynamic_pointer_array_get_count(
 			&results->results);
 	const struct lttng_error_query_results_comm header = {
-		.count = (typeof(header.count)) result_count,
+		.count = (decltype(header.count)) result_count,
 	};
 
 	/* Header. */
@@ -744,7 +744,7 @@ int lttng_error_query_serialize(const struct lttng_error_query *query,
 {
 	int ret;
 	const struct lttng_error_query_comm header = {
-		.target_type = (typeof(header.target_type)) query->target_type,
+		.target_type = (decltype(header.target_type)) query->target_type,
 	};
 
 	ret = lttng_dynamic_buffer_append(