oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Log, client/Response: adapt to libfmt 8.0.0 API changes

Browse Source
This commit is contained in:
Max Kellermann 2021-06-25 17:32:11 +02:00
parent 85b0029ba2
commit f60a42e0b6
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Log.cxx
View File

@ -35,7 +35,11 @@ LogVFmt(LogLevel level, const Domain &domain,
fmt::string_view format_str, fmt::format_args args) noexcept fmt::string_view format_str, fmt::format_args args) noexcept
{ {
fmt::memory_buffer buffer; fmt::memory_buffer buffer;
#if FMT_VERSION >= 80000
fmt::vformat_to(std::back_inserter(buffer), format_str, args);
#else
fmt::vformat_to(buffer, format_str, args); fmt::vformat_to(buffer, format_str, args);
#endif
Log(level, domain, {buffer.data(), buffer.size()}); Log(level, domain, {buffer.data(), buffer.size()});
} }

2
src/Log.hxx
View File

@ -24,7 +24,7 @@
#include "util/Compiler.h" #include "util/Compiler.h"
#include <fmt/core.h> #include <fmt/core.h>
#if FMT_VERSION < 70000 #if FMT_VERSION < 70000 || FMT_VERSION >= 80000
#include <fmt/format.h> #include <fmt/format.h>
#endif #endif

4
src/client/Response.cxx
View File

@ -44,7 +44,11 @@ bool
Response::VFmt(fmt::string_view format_str, fmt::format_args args) noexcept Response::VFmt(fmt::string_view format_str, fmt::format_args args) noexcept
{ {
fmt::memory_buffer buffer; fmt::memory_buffer buffer;
#if FMT_VERSION >= 80000
fmt::vformat_to(std::back_inserter(buffer), format_str, args);
#else
fmt::vformat_to(buffer, format_str, args); fmt::vformat_to(buffer, format_str, args);
#endif
return Write(buffer.data(), buffer.size()); return Write(buffer.data(), buffer.size());
} }

2
src/client/Response.hxx
View File

@ -23,7 +23,7 @@
#include "protocol/Ack.hxx" #include "protocol/Ack.hxx"
#include <fmt/core.h> #include <fmt/core.h>
#if FMT_VERSION < 70000 #if FMT_VERSION < 70000 || FMT_VERSION >= 80000
#include <fmt/format.h> #include <fmt/format.h>
#endif #endif