Merge pull request ceph#49479 from tchaikov/wip-rgw-fmt-v8

rgw: be compatible with fmtlib v8 Reviewed-by: Casey Bodley <[email protected]>
stefan-chivu · Dec 16, 2022 · 7471527 · 7471527
2 parents f2bb489 + d012e47
commit 7471527
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/rgw/driver/rados/rgw_data_sync.h b/src/rgw/driver/rados/rgw_data_sync.h
@@ -337,8 +337,13 @@ struct RGWDataSyncEnv {
 };
 
 // pretty ostream output for `radosgw-admin bucket sync run`
+#if FMT_VERSION >= 90000
 template<typename ...T>
 void pretty_print(const RGWDataSyncEnv* env, fmt::format_string<T...> fmt, T&& ...t) {
+#else
+template<typename S, typename ...T>
+void pretty_print(const RGWDataSyncEnv* env, const S& fmt, T&& ...t) {
+#endif
   if (unlikely(!!env->ostr)) {
     fmt::print(*env->ostr, fmt, std::forward<T>(t)...);
     env->ostr->flush();