Out out of range formatting for QJsonObject

It doesn't work for Qt's map types and in fmt 11.1 it causes compilation errors.
equeim · Jan 8, 2025 · 22e0a9a · 22e0a9a
1 parent de8302b
commit 22e0a9a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/log/formatters.h b/src/log/formatters.h
@@ -121,6 +121,14 @@ namespace fmt {
         struct formatter<Class> : tremotesf::impl::QDebugFormatter<Class> {}; \
     }
 
+#define DISABLE_RANGE_FORMATTING(Class)                          \
+    namespace fmt {                                              \
+        template<>                                               \
+        struct is_range<Class, char> : std::false_type {};       \
+        template<>                                               \
+        struct is_range<const Class, char> : std::false_type {}; \
+    }
+
 namespace fmt {
     template<>
     struct formatter<std::exception> : tremotesf::SimpleFormatter {

diff --git a/src/rpc/requestrouter.cpp b/src/rpc/requestrouter.cpp
@@ -27,6 +27,7 @@
 #include "pragmamacros.h"
 #include "rpc.h"
 
+DISABLE_RANGE_FORMATTING(QJsonObject)
 SPECIALIZE_FORMATTER_FOR_QDEBUG(QJsonObject)
 SPECIALIZE_FORMATTER_FOR_QDEBUG(QNetworkProxy)
 SPECIALIZE_FORMATTER_FOR_QDEBUG(QSslError)