Wed Feb 1 17:34:55 2023 UTC ()
nlohmann-json: Avoid ambiguous function call.
(jperkin)
diff -r1.1 -r1.2 pkgsrc/textproc/nlohmann-json/distinfo
diff -r0 -r1.1 pkgsrc/textproc/nlohmann-json/patches/patch-tests_thirdparty_doctest_doctest.h
--- pkgsrc/textproc/nlohmann-json/distinfo 2022/12/28 20:18:21 1.1
+++ pkgsrc/textproc/nlohmann-json/distinfo 2023/02/01 17:34:55 1.2
| @@ -1,5 +1,6 @@ | | | @@ -1,5 +1,6 @@ |
| 1 | $NetBSD: distinfo,v 1.1 2022/12/28 20:18:21 nikita Exp $ | | 1 | $NetBSD: distinfo,v 1.2 2023/02/01 17:34:55 jperkin Exp $ |
| 2 | | | 2 | |
| 3 | BLAKE2s (nlohmann-json-3.11.2.tar.gz) = c5caa9520466579cdee11e0831375f974b1be581ce764a41fc15979cd779aaba | | 3 | BLAKE2s (nlohmann-json-3.11.2.tar.gz) = c5caa9520466579cdee11e0831375f974b1be581ce764a41fc15979cd779aaba |
| 4 | SHA512 (nlohmann-json-3.11.2.tar.gz) = 70097c9bcd7a91254acbd41b8b68a6aaa371fc2dd7011f472917f69f1e2d2986155a0339dad791699d542e4a3be44dc49ae72ff73d0ee0ea4b34183296ce19a0 | | 4 | SHA512 (nlohmann-json-3.11.2.tar.gz) = 70097c9bcd7a91254acbd41b8b68a6aaa371fc2dd7011f472917f69f1e2d2986155a0339dad791699d542e4a3be44dc49ae72ff73d0ee0ea4b34183296ce19a0 |
| 5 | Size (nlohmann-json-3.11.2.tar.gz) = 8097673 bytes | | 5 | Size (nlohmann-json-3.11.2.tar.gz) = 8097673 bytes |
| | | 6 | SHA1 (patch-tests_thirdparty_doctest_doctest.h) = c0d7e0d754e61c7670db8a392ad53fd46f95ff3c |
$NetBSD: patch-tests_thirdparty_doctest_doctest.h,v 1.1 2023/02/01 17:34:55 jperkin Exp $
Avoid ambiguous function call.
--- tests/thirdparty/doctest/doctest.h.orig 2022-08-12 13:06:06.000000000 +0000
+++ tests/thirdparty/doctest/doctest.h
@@ -5803,9 +5803,9 @@ namespace {
separator_to_stream();
s << std::dec;
- auto totwidth = int(std::ceil(log10((std::max(p.numTestCasesPassingFilters, static_cast<unsigned>(p.numAsserts))) + 1)));
- auto passwidth = int(std::ceil(log10((std::max(p.numTestCasesPassingFilters - p.numTestCasesFailed, static_cast<unsigned>(p.numAsserts - p.numAssertsFailed))) + 1)));
- auto failwidth = int(std::ceil(log10((std::max(p.numTestCasesFailed, static_cast<unsigned>(p.numAssertsFailed))) + 1)));
+ auto totwidth = int(std::ceil(std::log10((std::max(p.numTestCasesPassingFilters, static_cast<unsigned>(p.numAsserts))) + 1)));
+ auto passwidth = int(std::ceil(std::log10((std::max(p.numTestCasesPassingFilters - p.numTestCasesFailed, static_cast<unsigned>(p.numAsserts - p.numAssertsFailed))) + 1)));
+ auto failwidth = int(std::ceil(std::log10((std::max(p.numTestCasesFailed, static_cast<unsigned>(p.numAssertsFailed))) + 1)));
const bool anythingFailed = p.numTestCasesFailed > 0 || p.numAssertsFailed > 0;
s << Color::Cyan << "[doctest] " << Color::None << "test cases: " << std::setw(totwidth)
<< p.numTestCasesPassingFilters << " | "