diff options
| author | Felix Morgner <felix.morgner@gmail.com> | 2023-08-06 21:04:47 +0200 |
|---|---|---|
| committer | Felix Morgner <felix.morgner@gmail.com> | 2023-08-06 21:28:07 +0200 |
| commit | 45ac296544dc66f0a7b2002e1ad240bf04aaabd4 (patch) | |
| tree | 1e85960329245e7796bd4bb22516a5a93ba084c9 | |
| parent | 26cebab9172c6f27e248fb1d296ce46bd6b81bb0 (diff) | |
| download | wanda-45ac296544dc66f0a7b2002e1ad240bf04aaabd4.tar.xz wanda-45ac296544dc66f0a7b2002e1ad240bf04aaabd4.zip | |
deps: update dependencies
| -rw-r--r-- | conan.lock | 20 | ||||
| -rw-r--r-- | conanfile.py | 10 | ||||
| -rw-r--r-- | source/lib/include/wanda/message.hpp | 10 | ||||
| -rw-r--r-- | source/lib/src/control_interface.cpp | 2 |
4 files changed, 36 insertions, 6 deletions
diff --git a/conan.lock b/conan.lock new file mode 100644 index 0000000..82eb85b --- /dev/null +++ b/conan.lock @@ -0,0 +1,20 @@ +{ + "version": "0.5", + "requires": [ + "zlib/1.2.13#e377bee636333ae348d51ca90874e353%1682597484.674", + "spdlog/1.12.0#c5fc262786548cbac34e6c38e16309a9%1688915175.09", + "lyra/1.6.1#7ec368ee0f9ba9f34ae72e466d2b3b51%1667926079.486", + "libpng/1.6.40#3b63a2aa000933a57a53322207790714%1687968865.34", + "libjpeg/9e#68269859e4325ddc3f995d1fd3fc9187%1674953155.168", + "libbacktrace/cci.20210118#ec1aa63bbc10145c6a299e68e711670c%1676205469.545", + "fmt/10.0.0#dd5e3eb81b512a1bb34a5aab88a07e82%1684225718.04", + "bzip2/1.0.8#411fc05e80d47a89045edc1ee6f23c1d%1678293522.814", + "boost/1.82.0#902463606663219fc8c6d2102f1b8c6a%1685704970.086", + "asio/1.28.1#9b4fb4d434f6b12dc44c116b57f6e25d%1691066750.28" + ], + "build_requires": [ + "cmake/3.27.0#1916e6ab33353145b93244d065a2c868%1689871516.022", + "b2/4.9.6#2e02945ad41739b8051247d14fe8297d%1679927934.674" + ], + "python_requires": [] +}
\ No newline at end of file diff --git a/conanfile.py b/conanfile.py index b13f076..4db2fe8 100644 --- a/conanfile.py +++ b/conanfile.py @@ -30,15 +30,15 @@ class Wanda(ConanFile): "source/*", ) requires = ( - "asio/[~1.24.0]", - "boost/[~1.80.0]", - "libjpeg/9d", + "asio/[~1.28.0]", + "boost/[~1.82.0]", + "libjpeg/9e", "libpng/[~1.6.0]", "lyra/[~1.6.0]", - "spdlog/[~1.10.0]", + "spdlog/[~1.12.0]", ) tool_requires = ( - "cmake/[~3.26]", + "cmake/[~3.27]", ) def build(self): diff --git a/source/lib/include/wanda/message.hpp b/source/lib/include/wanda/message.hpp index 866408f..0f3034c 100644 --- a/source/lib/include/wanda/message.hpp +++ b/source/lib/include/wanda/message.hpp @@ -11,6 +11,7 @@ #include <istream> #include <optional> #include <string> +#include <fmt/core.h> namespace wanda { @@ -80,4 +81,13 @@ namespace wanda } // namespace wanda +template<> +struct fmt::formatter<wanda::message> : fmt::formatter<std::string> +{ + auto format(wanda::message const & message, format_context & context) const + { + return formatter<string_view>::format(static_cast<std::string>(message), context); + } +}; + #endif
\ No newline at end of file diff --git a/source/lib/src/control_interface.cpp b/source/lib/src/control_interface.cpp index 5f4cf26..68005f9 100644 --- a/source/lib/src/control_interface.cpp +++ b/source/lib/src/control_interface.cpp @@ -75,7 +75,7 @@ namespace wanda m_acceptor.async_accept(m_socket, [that = shared_from_this(), this](auto const & error) { if (error && error != asio::error::operation_aborted) { - get_logger()->error("failed to accept connection because '{}'", error); + get_logger()->error("failed to accept connection because '{}'", error.message()); } else { |