From b64a0a6b49bba67affe538b34f5743c387d61feb Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sun, 22 Nov 2026 15:04:29 +0100 Subject: [PATCH] Fix the AppVeyor build of develop with VS 2015 and VS 2017 unit-bon8: VS 2015 finds no unambiguous operator== for std::fpos and int, even outside doctest's decomposition (#6128 did not help). Compare the position as std::streamoff. unit-ubjson_valueless: VS 2015/2017 warn C4309 (truncation of constant value) for static_cast(payload) with the constexpr payload 4096, which /WX turns into an error. Mask each byte before the cast. Signed-off-by: Niels Lohmann --- tests/src/unit-bon8.cpp | 2 +- tests/src/unit-ubjson_valueless.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/src/unit-bon8.cpp b/tests/src/unit-bon8.cpp index 84522db64..f05edd4f8 100644 --- a/tests/src/unit-bon8.cpp +++ b/tests/src/unit-bon8.cpp @@ -622,7 +622,7 @@ TEST_CASE("BON8") // with a terminated string, strict = false leaves the next value in the stream std::istringstream terminated(std::string("\x61\xFF\x90", 3)); CHECK(json::from_bon8(terminated, false) == "a"); - CHECK((terminated.tellg() == 2)); + CHECK(static_cast(terminated.tellg()) == 2); CHECK(json::from_bon8(terminated, false) == 0); // without the terminator, the next value would be lost diff --git a/tests/src/unit-ubjson_valueless.cpp b/tests/src/unit-ubjson_valueless.cpp index 2ceb3f99b..91bfe9e69 100644 --- a/tests/src/unit-ubjson_valueless.cpp +++ b/tests/src/unit-ubjson_valueless.cpp @@ -238,8 +238,8 @@ TEST_CASE("UBJSON the valueless elements of a whole input are bounded") std::vector input = {'['}; utils::append_valueless_array(input, 'Z', first_count); input.insert(input.end(), {'[', '$', 'U', '#', 'l', - static_cast(payload >> 24), static_cast(payload >> 16), - static_cast(payload >> 8), static_cast(payload) + static_cast((payload >> 24) & 0xFFu), static_cast((payload >> 16) & 0xFFu), + static_cast((payload >> 8) & 0xFFu), static_cast(payload & 0xFFu) }); input.insert(input.end(), payload, 0x01); utils::append_valueless_array(input, 'Z', count);