Clean-up: ensure all template parameter names end with Type

[lttng-tools.git] / src / bin / lttng-sessiond / field.hpp

diff --git a/src/bin/lttng-sessiond/field.hpp b/src/bin/lttng-sessiond/field.hpp
index da1514f90825a7c37b2fba4d133e43b10faaba28..207592b3f2af83ca9e3262222f2365828364951d 100644 (file)
--- a/src/bin/lttng-sessiond/field.hpp
+++ b/src/bin/lttng-sessiond/field.hpp
@@ -500,8 +500,6 @@ private:
                        return false;
                }
 
-               return true;
-
                return std::equal(a.cbegin(), a.cend(), b.cbegin(),
                                [](const choice& choice_a, const choice& choice_b) {
                                        return choice_a.first == choice_b.first &&
@@ -562,9 +560,9 @@ protected:
 namespace fmt {
 template <>
 struct formatter<lttng::sessiond::trace::field_location> : formatter<std::string> {
-       template <typename FormatCtx>
-       typename FormatCtx::iterator format(
-                       const lttng::sessiond::trace::field_location& location, FormatCtx& ctx)
+       template <typename FormatContextType>
+       typename FormatContextType::iterator format(
+                       const lttng::sessiond::trace::field_location& location, FormatContextType& ctx)
        {
                std::string location_str{"["};
 
@@ -614,10 +612,10 @@ template <typename MappingIntegerType>
 template <>
 struct formatter<typename lttng::sessiond::trace::signed_enumeration_type::mapping::range_t>
        : formatter<std::string> {
-       template <typename FormatCtx>
-       typename FormatCtx::iterator
+       template <typename FormatContextType>
+       typename FormatContextType::iterator
        format(typename lttng::sessiond::trace::signed_enumeration_type::mapping::range_t range,
-                       FormatCtx& ctx)
+                       FormatContextType& ctx)
        {
                return format_to(ctx.out(),
                                details::format_mapping_range<
@@ -630,10 +628,10 @@ struct formatter<typename lttng::sessiond::trace::signed_enumeration_type::mappi
 template <>
 struct formatter<typename lttng::sessiond::trace::unsigned_enumeration_type::mapping::range_t>
        : formatter<std::string> {
-       template <typename FormatCtx>
-       typename FormatCtx::iterator
+       template <typename FormatContextType>
+       typename FormatContextType::iterator
        format(typename lttng::sessiond::trace::unsigned_enumeration_type::mapping::range_t range,
-                       FormatCtx& ctx)
+                       FormatContextType& ctx)
        {
                return format_to(ctx.out(),
                                details::format_mapping_range<