X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fformat.hpp;h=2ba6cef125ab735ae8977c88dde7298c0c889f93;hb=HEAD;hp=07673e7a98166ad9acd5b7d714693be9d3b9b8df;hpb=830bc99366f13bfb3d6fc975441aba7388cb7ca1;p=lttng-tools.git

diff --git a/src/common/format.hpp b/src/common/format.hpp
index 07673e7a9..59ed1637c 100644
--- a/src/common/format.hpp
+++ b/src/common/format.hpp
@@ -16,7 +16,6 @@
 DIAGNOSTIC_PUSH
 DIAGNOSTIC_IGNORE_SUGGEST_ATTRIBUTE_FORMAT
 DIAGNOSTIC_IGNORE_DUPLICATED_BRANCHES
-#define FMT_HEADER_ONLY
 #include <vendor/fmt/core.h>
 DIAGNOSTIC_POP
 
@@ -31,14 +30,14 @@ template <>
 struct formatter<std::type_info> : formatter<std::string> {
 	template <typename FormatContextType>
 	typename FormatContextType::iterator format(const std::type_info& type_info,
-						    FormatContextType& ctx)
+						    FormatContextType& ctx) const
 	{
 		int status;
 		/*
 		 * The documentation of __cxa_demangle mentions the returned string is allocated
-		 * using malloc (not new), hence the use of lttng::free.
+		 * using malloc (not new), hence the use of lttng::memory::free.
 		 */
-		const auto demangled_name = lttng::make_unique_wrapper<char, lttng::free>(
+		const auto demangled_name = lttng::make_unique_wrapper<char, lttng::memory::free>(
 			abi::__cxa_demangle(type_info.name(), nullptr, nullptr, &status));
 
 		auto it = status == 0 ? formatter<std::string>::format(demangled_name.get(), ctx) :