fmt usage fixes

Make format() functions const (preparation for upgrade to fmt 11), prefix format_parse_context with fmt:: (needed when building opendigitizer with gcc 14.0.1). Signed-off-by: Frank Osterfeld <[email protected]>
fair-acc · Oct 2, 2024 · 08945bf · 08945bf
1 parent b43a32e
commit 08945bf
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/blocks/soapy/include/gnuradio-4.0/soapy/SoapyRaiiWrapper.hpp b/blocks/soapy/include/gnuradio-4.0/soapy/SoapyRaiiWrapper.hpp
@@ -780,7 +780,7 @@ static_assert(std::is_default_constructible_v<Device::Stream<float, SOAPY_SDR_RX
 
 template<>
 struct fmt::formatter<SoapySDRRange> {
-    constexpr auto parse(format_parse_context& ctx) const noexcept { return ctx.begin(); }
+    constexpr auto parse(fmt::format_parse_context& ctx) const noexcept { return ctx.begin(); }
 
     template<typename FormatContext>
     auto format(const gr::blocks::soapy::Range& range, FormatContext& ctx) const noexcept {

diff --git a/core/include/gnuradio-4.0/BlockModel.hpp b/core/include/gnuradio-4.0/BlockModel.hpp
@@ -513,7 +513,7 @@ struct fmt::formatter<gr::Edge> {
     }
 
     template<typename FormatContext>
-    auto format(const gr::Edge& e, FormatContext& ctx) {
+    auto format(const gr::Edge& e, FormatContext& ctx) const {
         const auto& name = [this](const gr::BlockModel* block) { return (formatSpecifier == 'l') ? block->uniqueName() : block->name(); };
 
         const auto portIndex = [](const gr::PortDefinition& port) {

diff --git a/core/include/gnuradio-4.0/Sequence.hpp b/core/include/gnuradio-4.0/Sequence.hpp
@@ -177,7 +177,7 @@ struct fmt::formatter<gr::Sequence> {
     }
 
     template<typename FormatContext>
-    auto format(gr::Sequence const& value, FormatContext& ctx) {
+    auto format(gr::Sequence const& value, FormatContext& ctx) const {
         return fmt::format_to(ctx.out(), "{}", value.value());
     }
 };

diff --git a/core/include/gnuradio-4.0/annotated.hpp b/core/include/gnuradio-4.0/annotated.hpp
@@ -423,7 +423,7 @@ struct fmt::formatter<gr::Annotated<T, description, Arguments...>> {
     }
 
     template<typename FormatContext>
-    constexpr auto format(const gr::Annotated<T, description, Arguments...>& annotated, FormatContext& ctx) {
+    constexpr auto format(const gr::Annotated<T, description, Arguments...>& annotated, FormatContext& ctx) const {
         // TODO: add switch for printing only brief and/or meta-information
         return value_formatter.format(annotated.value, ctx);
     }

diff --git a/core/include/gnuradio-4.0/thread/thread_affinity.hpp b/core/include/gnuradio-4.0/thread/thread_affinity.hpp
@@ -258,7 +258,7 @@ struct fmt::formatter<gr::thread_pool::thread::Policy> {
     }
 
     template<typename FormatContext>
-    auto format(Policy policy, FormatContext& ctx) {
+    auto format(Policy policy, FormatContext& ctx) const {
         std::string policy_name;
         switch (policy) {
         case Policy::UNKNOWN: policy_name = "UNKNOWN"; break;

diff --git a/meta/include/gnuradio-4.0/meta/formatter.hpp b/meta/include/gnuradio-4.0/meta/formatter.hpp
@@ -82,7 +82,7 @@ struct fmt::formatter<std::complex<T>> {
 // simplified formatter for UncertainValue
 template<gr::arithmetic_or_complex_like T>
 struct fmt::formatter<gr::UncertainValue<T>> {
-    constexpr auto parse(format_parse_context& ctx) const noexcept -> decltype(ctx.begin()) { return ctx.begin(); }
+    constexpr auto parse(fmt::format_parse_context& ctx) const noexcept -> decltype(ctx.begin()) { return ctx.begin(); }
 
     template<typename FormatContext>
     constexpr auto format(const gr::UncertainValue<T>& value, FormatContext& ctx) const noexcept {
@@ -126,7 +126,7 @@ constexpr std::string join(const Container& container, const Separator& separato
 
 template<>
 struct fmt::formatter<pmtv::map_t::value_type> {
-    constexpr auto parse(format_parse_context& ctx) const noexcept -> decltype(ctx.begin()) { return ctx.begin(); }
+    constexpr auto parse(fmt::format_parse_context& ctx) const noexcept -> decltype(ctx.begin()) { return ctx.begin(); }
 
     template<typename FormatContext>
     auto format(const pmtv::map_t::value_type& kv, FormatContext& ctx) const noexcept {
@@ -136,7 +136,7 @@ struct fmt::formatter<pmtv::map_t::value_type> {
 
 template<pmtv::IsPmt T>
 struct fmt::formatter<T> { // alternate pmtv formatter optimised for compile-time not runtime
-    constexpr auto parse(format_parse_context& ctx) const noexcept -> decltype(ctx.begin()) { return ctx.begin(); }
+    constexpr auto parse(fmt::format_parse_context& ctx) const noexcept -> decltype(ctx.begin()) { return ctx.begin(); }
 
     template<typename FormatContext>
     auto format(const T& value, FormatContext& ctx) const noexcept {
@@ -180,7 +180,7 @@ struct fmt::formatter<T> { // alternate pmtv formatter optimised for compile-tim
 
 template<>
 struct fmt::formatter<pmtv::map_t> {
-    constexpr auto parse(format_parse_context& ctx) const noexcept -> decltype(ctx.begin()) { return ctx.begin(); }
+    constexpr auto parse(fmt::format_parse_context& ctx) const noexcept -> decltype(ctx.begin()) { return ctx.begin(); }
 
     template<typename FormatContext>
     constexpr auto format(const pmtv::map_t& value, FormatContext& ctx) const noexcept {
@@ -194,7 +194,7 @@ template<>
 struct fmt::formatter<std::vector<bool>> {
     char presentation = 'c';
 
-    constexpr auto parse(format_parse_context& ctx) -> decltype(ctx.begin()) {
+    constexpr auto parse(fmt::format_parse_context& ctx) -> decltype(ctx.begin()) {
         auto it = ctx.begin(), end = ctx.end();
         if (it != end && (*it == 's' || *it == 'c')) {
             presentation = *it++;