[3rdparty] fmt updates, match with std::format

ossia · Jun 9, 2024 · 11d75ec · 11d75ec
1 parent 130e64f
commit 11d75ec
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/3rdparty/fmt b/3rdparty/fmt
diff --git a/cmake/deps/fmt.cmake b/cmake/deps/fmt.cmake
@@ -40,6 +40,7 @@ if(NOT TARGET fmt::fmt)
   endif()
 
   add_library(fmt::fmt ALIAS fmt)
+  add_library(fmt::fmt-header-only ALIAS fmt)
 endif()
 
 set(OSSIA_HAS_FMT 1 CACHE INTERNAL "")
diff --git a/src/ossia/network/common/debug.hpp b/src/ossia/network/common/debug.hpp
@@ -29,7 +29,7 @@ struct formatter<ossia::access_mode>
   }
 
   template <typename FormatContext>
-  auto format(ossia::access_mode e, FormatContext& ctx)
+  auto format(ossia::access_mode e, FormatContext& ctx) const
   {
     string_view name = "unknown";
     switch(e)
@@ -58,7 +58,7 @@ struct formatter<ossia::bounding_mode> final : formatter<string_view>
   }
 
   template <typename FormatContext>
-  auto format(ossia::bounding_mode e, FormatContext& ctx)
+  auto format(ossia::bounding_mode e, FormatContext& ctx) const
   {
     string_view name = "unknown";
     switch(e)
@@ -96,7 +96,7 @@ struct formatter<ossia::domain> final : formatter<string_view>
   }
 
   template <typename FormatContext>
-  auto format(const ossia::domain& e, FormatContext& ctx)
+  auto format(const ossia::domain& e, FormatContext& ctx) const
   {
     return formatter<string_view>::format(e.to_pretty_string(), ctx);
   }
@@ -112,7 +112,7 @@ struct formatter<ossia::net::node_base>
   }
 
   template <typename FormatContext>
-  auto format(const ossia::net::node_base& n, FormatContext& ctx)
+  auto format(const ossia::net::node_base& n, FormatContext& ctx) const
   {
     int num_indent = 0;
     auto parent = n.get_parent();

diff --git a/src/ossia/network/context.hpp b/src/ossia/network/context.hpp
@@ -3,11 +3,14 @@
 
 #include <boost/asio/executor_work_guard.hpp>
 #include <boost/asio/io_context.hpp>
+#include <boost/asio/strand.hpp>
 
 #include <memory>
 
 namespace ossia::net
 {
+using strand_type
+    = decltype(boost::asio::make_strand(std::declval<boost::asio::io_context&>()));
 struct network_context
 {
   boost::asio::io_context context;

diff --git a/src/ossia/network/osc/detail/osc_receive.hpp b/src/ossia/network/osc/detail/osc_receive.hpp
@@ -24,7 +24,7 @@ struct formatter<oscpack::ReceivedMessage>
   }
 
   template <typename FormatContext>
-  auto format(const oscpack::ReceivedMessage& m, FormatContext& ctx)
+  auto format(const oscpack::ReceivedMessage& m, FormatContext& ctx) const
   {
     auto out = ctx.out();
     out = fmt::format_to(out, "{}", m.AddressPattern());