Get fmt 11.1.1 to compile (#13855)

AliceO2Group · Jan 12, 2025 · 0c08b77 · 0c08b77
1 parent a6d96bc
commit 0c08b77
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/DataFormats/Headers/include/Headers/DataHeaderHelpers.h b/DataFormats/Headers/include/Headers/DataHeaderHelpers.h
@@ -38,7 +38,7 @@ struct fmt::formatter<T, std::enable_if_t<o2::header::is_descriptor<T>::value, c
   }
 
   template <typename FormatContext>
-  auto format(const T& p, FormatContext& ctx)
+  auto format(const T& p, FormatContext& ctx) const
   {
     return fmt::format_to(ctx.out(), "{}", p.template as<std::string>());
   }
@@ -67,7 +67,7 @@ struct fmt::formatter<o2::header::DataHeader> {
   }
 
   template <typename FormatContext>
-  auto format(const o2::header::DataHeader& h, FormatContext& ctx)
+  auto format(const o2::header::DataHeader& h, FormatContext& ctx) const
   {
     if (presentation == 's') {
       auto res = fmt::format("Data header version {}, flags: {}\n", h.headerVersion, h.flags) +

diff --git a/EventVisualisation/Workflow/src/O2DPLDisplay.cxx b/EventVisualisation/Workflow/src/O2DPLDisplay.cxx
@@ -229,7 +229,8 @@ void O2DPLDisplaySpec::run(ProcessingContext& pc)
     }
   }
 
-  LOGP(info, "Tracks: {}", fmt::join(sourceStats, ", "));
+  // FIXME: find out why this does not work with 11.1.1
+//  LOGP(info, "Tracks: {}", fmt::join(sourceStats, ", "));
 }
 
 void O2DPLDisplaySpec::endOfStream(EndOfStreamContext& ec)

diff --git a/Framework/Core/include/Framework/Formatters.h b/Framework/Core/include/Framework/Formatters.h
@@ -20,7 +20,7 @@ struct fmt::formatter<o2::framework::Lifetime> : fmt::formatter<std::string_view
   char presentation = 's';
 
   template <typename FormatContext>
-  auto format(o2::framework::Lifetime const& h, FormatContext& ctx)
+  auto format(o2::framework::Lifetime const& h, FormatContext& ctx) const
   {
     std::string_view s = "unknown";
     switch (h) {

diff --git a/Framework/Core/src/ComputingQuotaEvaluator.cxx b/Framework/Core/src/ComputingQuotaEvaluator.cxx
@@ -24,6 +24,7 @@
 
 #define LOGLEVEL debug
 
+
 namespace o2::framework
 {
 
@@ -90,7 +91,7 @@ bool ComputingQuotaEvaluator::selectOffer(int task, ComputingQuotaRequest const&
     }
     if (enough) {
       LOGP(LOGLEVEL, "{} offers were selected for a total of: cpu {}, memory {}, shared memory {}", result.size(), totalOffer.cpu, totalOffer.memory, totalOffer.sharedMemory);
-      LOGP(LOGLEVEL, "  The following offers were selected for computation: {} ", fmt::join(result, ","));
+      //LOG(LOGLEVEL) << "  The following offers were selected for computation: {} " << fmt::join(result, ", ");
       dpStats.updateStats({static_cast<short>(ProcessingStatsId::RESOURCES_SATISFACTORY), DataProcessingStats::Op::Add, 1});
     } else {
       dpStats.updateStats({static_cast<short>(ProcessingStatsId::RESOURCES_MISSING), DataProcessingStats::Op::Add, 1});
@@ -99,16 +100,16 @@ bool ComputingQuotaEvaluator::selectOffer(int task, ComputingQuotaRequest const&
       }
     }
     if (stats.invalidOffers.size()) {
-      LOGP(LOGLEVEL, "  The following offers were invalid: {}", fmt::join(stats.invalidOffers, ", "));
+    //  LOGP(LOGLEVEL, "  The following offers were invalid: {}", fmt::join(stats.invalidOffers, ", "));
     }
     if (stats.otherUser.size()) {
-      LOGP(LOGLEVEL, "  The following offers were owned by other users: {}", fmt::join(stats.otherUser, ", "));
+     // LOGP(LOGLEVEL, "  The following offers were owned by other users: {}", fmt::join(stats.otherUser, ", "));
     }
     if (stats.expired.size()) {
-      LOGP(LOGLEVEL, "  The following offers are expired: {}", fmt::join(stats.expired, ", "));
+     // LOGP(LOGLEVEL, "  The following offers are expired: {}", fmt::join(stats.expired, ", "));
     }
     if (stats.unexpiring.size() > 1) {
-      LOGP(LOGLEVEL, "  The following offers will never expire: {}", fmt::join(stats.unexpiring, ", "));
+     // LOGP(LOGLEVEL, "  The following offers will never expire: {}", fmt::join(stats.unexpiring, ", "));
     }
 
     return enough;