From 4f2da8b8c0f8fad2ae35dbdb9f29769da52a3dc1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?=
 <jeremie.galarneau@efficios.com>
Date: Fri, 13 Jan 2023 11:41:32 -0500
Subject: [PATCH] Clean-up: remove unused _trace_abi field from the CTF2 trace
 class visitor
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

This unused field results in a build failure when using clang++ 14.0.6
with Werror.

  ./ctf2-trace-class-visitor.hpp:39:37: error: private field '_trace_abi' is not used [-Werror,-Wunused-private-field]
          const lttng::sessiond::trace::abi& _trace_abi;

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: Ib85ad5c9c5affce123ee6300b8549f884a55df31
---
 src/bin/lttng-sessiond/ctf2-trace-class-visitor.cpp | 4 ++--
 src/bin/lttng-sessiond/ctf2-trace-class-visitor.hpp | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/bin/lttng-sessiond/ctf2-trace-class-visitor.cpp b/src/bin/lttng-sessiond/ctf2-trace-class-visitor.cpp
index b7ab303a1..6a6248504 100644
--- a/src/bin/lttng-sessiond/ctf2-trace-class-visitor.cpp
+++ b/src/bin/lttng-sessiond/ctf2-trace-class-visitor.cpp
@@ -368,9 +368,9 @@ private:
 
 }; /* namespace */
 
-lsc::trace_class_visitor::trace_class_visitor(const lst::abi& trace_abi,
+lsc::trace_class_visitor::trace_class_visitor(
 		lsc::append_metadata_fragment_function append_metadata_fragment) :
-	_trace_abi{trace_abi}, _append_metadata_fragment(append_metadata_fragment)
+	_append_metadata_fragment(append_metadata_fragment)
 {
 }
 
diff --git a/src/bin/lttng-sessiond/ctf2-trace-class-visitor.hpp b/src/bin/lttng-sessiond/ctf2-trace-class-visitor.hpp
index 0d2896123..b709a0294 100644
--- a/src/bin/lttng-sessiond/ctf2-trace-class-visitor.hpp
+++ b/src/bin/lttng-sessiond/ctf2-trace-class-visitor.hpp
@@ -25,8 +25,7 @@ using append_metadata_fragment_function = std::function<void(const std::string&
 
 class trace_class_visitor : public lttng::sessiond::trace::trace_class_visitor {
 public:
-	trace_class_visitor(const lttng::sessiond::trace::abi& trace_abi,
-			append_metadata_fragment_function append_metadata);
+	trace_class_visitor(append_metadata_fragment_function append_metadata);
 
 	virtual void visit(const lttng::sessiond::trace::trace_class& trace_class) override final;
 	virtual void visit(const lttng::sessiond::trace::clock_class& clock_class) override final;
@@ -36,7 +35,6 @@ public:
 private:
 	void append_metadata_fragment(const nlohmann::json& fragment) const;
 
-	const lttng::sessiond::trace::abi& _trace_abi;
 	const append_metadata_fragment_function _append_metadata_fragment;
 };
 
-- 
2.34.1