From f39be139b2c474de6feadf3afe413159fbe24eac Mon Sep 17 00:00:00 2001 From: Marcus Holland-Moritz Date: Wed, 24 Jul 2024 10:39:20 +0200 Subject: [PATCH] fix: compatibility with fmt v11 --- include/dwarfs/compression_metadata_requirements.h | 3 +++ include/dwarfs/fragment_category.h | 2 +- src/dwarfs/option_map.cpp | 3 +++ src/dwarfs/performance_monitor.cpp | 3 +++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/include/dwarfs/compression_metadata_requirements.h b/include/dwarfs/compression_metadata_requirements.h index 668d6620..69115df7 100644 --- a/include/dwarfs/compression_metadata_requirements.h +++ b/include/dwarfs/compression_metadata_requirements.h @@ -31,6 +31,9 @@ #include #include +#if FMT_VERSION >= 110000 +#include +#endif #include diff --git a/include/dwarfs/fragment_category.h b/include/dwarfs/fragment_category.h index 1a02ebb5..13847098 100644 --- a/include/dwarfs/fragment_category.h +++ b/include/dwarfs/fragment_category.h @@ -121,7 +121,7 @@ operator<<(std::ostream& os, fragment_category const& cat) { template <> struct fmt::formatter : formatter { template - auto format(dwarfs::fragment_category const& cat, FormatContext& ctx) { + auto format(dwarfs::fragment_category const& cat, FormatContext& ctx) const { if (cat) { if (cat.has_subcategory()) { return formatter::format( diff --git a/src/dwarfs/option_map.cpp b/src/dwarfs/option_map.cpp index d061c81a..249114f7 100644 --- a/src/dwarfs/option_map.cpp +++ b/src/dwarfs/option_map.cpp @@ -23,6 +23,9 @@ #include #include +#if FMT_VERSION >= 110000 +#include +#endif #include diff --git a/src/dwarfs/performance_monitor.cpp b/src/dwarfs/performance_monitor.cpp index 21351e65..fe3c985a 100644 --- a/src/dwarfs/performance_monitor.cpp +++ b/src/dwarfs/performance_monitor.cpp @@ -39,6 +39,9 @@ #include #include +#if FMT_VERSION >= 110000 +#include +#endif #include #include