fix compatibility issues with libfmt 10+

Tectu · Sep 21, 2023 · d08dd24 · d08dd24
1 parent 51807d6
commit d08dd24
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/lib/malloy/core/external.cmake b/lib/malloy/core/external.cmake
@@ -20,8 +20,8 @@ find_package(
 if (MALLOY_DEPENDENCY_FMT_DOWNLOAD)
     FetchContent_Declare(
         fmt 
-        GIT_REPOSITORY https://github.com/fmtlib/fmt
-        GIT_TAG 9.1.0 # Supported by spdlog 1.11.0
+        GIT_REPOSITORY  https://github.com/fmtlib/fmt
+        GIT_TAG         10.1.1
     )
     FetchContent_GetProperties(fmt)
     if (NOT fmt_POPULATED) 

diff --git a/lib/malloy/server/http/connection_detector.cpp b/lib/malloy/server/http/connection_detector.cpp
@@ -42,8 +42,8 @@ class router_adaptor :
     {
         conn->logger()->info(
             "WS request: {} {}",
-            req->header().method_string(),
-            req->header().target()
+            std::string_view{req->header().method_string()},
+            std::string_view{req->header().target()}
         );
 
         handle<true>(root, req, conn);
@@ -56,8 +56,8 @@ class router_adaptor :
             conn,
             spdlog::level::info,
             "HTTP request: {} {}",
-            req->header().method_string(),
-            req->header().target()
+            std::string_view{req->header().method_string()},
+            std::string_view{req->header().target()}
         );
 
         handle<false>(root, req, conn);

diff --git a/lib/malloy/server/routing/router.hpp b/lib/malloy/server/routing/router.hpp
@@ -534,8 +534,9 @@ namespace malloy::server
             // Log
             if (m_logger) {
                 m_logger->trace("handling HTTP request: {} {}",
-                                req->header().method_string(),
-                                req->header().target());
+                    std::string_view{req->header().method_string()},
+                    std::string_view{req->header().target()}
+                );
             }
 
             const auto& header = req->header();
@@ -576,8 +577,9 @@ namespace malloy::server
         {
             const auto res_string = malloy::http::resource_string(gen->header());
             m_logger->trace("handling WS request: {} {}",
-                            gen->header().method_string(),
-                            res_string);
+                std::string_view{gen->header().method_string()},
+                res_string
+            );
 
             // Check routes
             for (const auto& ep : m_endpoints_websocket) {