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

[lttng-tools.git] / src / common / format.hpp

diff --git a/src/common/format.hpp b/src/common/format.hpp
index 73b363408f49cf499f326f601c1bdd0cd8835478..67509c275bad365ee23c2bd86ec7ab6fe44df5aa 100644 (file)
--- a/src/common/format.hpp
+++ b/src/common/format.hpp
@@ -19,19 +19,27 @@ DIAGNOSTIC_IGNORE_DUPLICATED_BRANCHES
 #include <vendor/fmt/core.h>
 DIAGNOSTIC_POP
 
+/*
+ * Due to a bug in g++ < 7.1, this specialization must be enclosed in the fmt namespace,
+ * see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=56480.
+ */
+namespace fmt {
 template <>
-struct fmt::formatter<std::type_info> : fmt::formatter<std::string> {
-       template <typename FormatCtx>
-       typename FormatCtx::iterator format(const std::type_info& type_info, FormatCtx& ctx)
+struct formatter<std::type_info> : formatter<std::string> {
+       template <typename FormatContextType>
+       typename FormatContextType::iterator format(const std::type_info& type_info,
+                                                   FormatContextType& ctx)
        {
                int status;
-               auto demangled_name = abi::__cxa_demangle(type_info.name(), nullptr, 0, &status);
-               auto it = status == 0 ? fmt::formatter<std::string>::format(demangled_name, ctx) :
-                                             fmt::formatter<std::string>::format(type_info.name(), ctx);
+               auto demangled_name =
+                       abi::__cxa_demangle(type_info.name(), nullptr, nullptr, &status);
+               auto it = status == 0 ? formatter<std::string>::format(demangled_name, ctx) :
+                                       formatter<std::string>::format(type_info.name(), ctx);
 
                free(demangled_name);
                return it;
        }
 };
+} /* namespace fmt */
 
 #endif /* LTTNG_FORMAT_H */