diff options
| author |   Craig Andrews <candrews@gentoo.org> | 2020-07-06 13:06:17 -0400 |
|---|---|---|
| committer | Craig Andrews <candrews@gentoo.org> | 2020-07-06 15:15:40 -0400 |
| commit | 07d3f7a5daab2a29c4644675bd608d46189cf023 (patch) | |
| tree | 2fce9c25859acee8899ae8eb5eeeaebe516b0de3 /dev-libs/spdlog/files | |
| parent | dev-python/doit: Stabilize 0.32.0-r1 amd64, #723994 (diff) | |
| download | gentoo-07d3f7a5daab2a29c4644675bd608d46189cf023.tar.gz gentoo-07d3f7a5daab2a29c4644675bd608d46189cf023.tar.bz2 gentoo-07d3f7a5daab2a29c4644675bd608d46189cf023.zip | |
dev-libs/spdlog: Compatibility with dev-libs/libfmt-7.0.0
Closes: https://bugs.gentoo.org/show_bug.cgi?id=731100
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Craig Andrews <candrews@gentoo.org>
Diffstat (limited to 'dev-libs/spdlog/files')
| -rw-r--r-- | dev-libs/spdlog/files/spdlog-1.6.1-libfmt-7.0.0.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/dev-libs/spdlog/files/spdlog-1.6.1-libfmt-7.0.0.patch b/dev-libs/spdlog/files/spdlog-1.6.1-libfmt-7.0.0.patch new file mode 100644 index 000000000000..422a507a6d86 --- /dev/null +++ b/dev-libs/spdlog/files/spdlog-1.6.1-libfmt-7.0.0.patch @@ -0,0 +1,33 @@ +https://github.com/gabime/spdlog/pull/1606 + +From 22bee8128a4150ce37cf761ed9a609ad891848a6 Mon Sep 17 00:00:00 2001 +From: Craig Andrews <candrews@integralblue.com> +Date: Mon, 6 Jul 2020 13:01:52 -0400 +Subject: [PATCH] fmt 7.0.0 renamed the internal namespace to detail. + +See: https://github.com/fmtlib/fmt/issues/1538 +--- + include/spdlog/details/fmt_helper.h | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/include/spdlog/details/fmt_helper.h b/include/spdlog/details/fmt_helper.h +index cbc0bdf3..4f363858 100644 +--- a/include/spdlog/details/fmt_helper.h ++++ b/include/spdlog/details/fmt_helper.h +@@ -34,7 +34,15 @@ template<typename T> + inline unsigned int count_digits(T n) + { + using count_type = typename std::conditional<(sizeof(T) > sizeof(uint32_t)), uint64_t, uint32_t>::type; +- return static_cast<unsigned int>(fmt::internal::count_digits(static_cast<count_type>(n))); ++ return static_cast<unsigned int>(fmt:: ++// fmt 7.0.0 renamed the internal namespace to detail. ++// See: https://github.com/fmtlib/fmt/issues/1538 ++#if FMT_VERSION < 70000 ++internal ++#else ++detail ++#endif ++::count_digits(static_cast<count_type>(n))); + } + + inline void pad2(int n, memory_buf_t &dest) |