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<std::uint8_t>(payload) with the constexpr payload
4096, which /WX turns into an error. Mask each byte before the cast.

Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
Niels Lohmann committed 2026-11-22 15:04:29 +01:00
1 parent e20f6dc35d
commit b64a0a6b49
2 files changed
+3 -3

No files matched your search

+1 -1
View File
@@ -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<std::streamoff>(terminated.tellg()) == 2);
CHECK(json::from_bon8(terminated, false) == 0);
// without the terminator, the next value would be lost
+2 -2
View File
@@ -238,8 +238,8 @@ TEST_CASE("UBJSON the valueless elements of a whole input are bounded")
std::vector<std::uint8_t> input = {'['};
utils::append_valueless_array(input, 'Z', first_count);
input.insert(input.end(), {'[', '$', 'U', '#', 'l',
static_cast<std::uint8_t>(payload >> 24), static_cast<std::uint8_t>(payload >> 16),
static_cast<std::uint8_t>(payload >> 8), static_cast<std::uint8_t>(payload)
static_cast<std::uint8_t>((payload >> 24) & 0xFFu), static_cast<std::uint8_t>((payload >> 16) & 0xFFu),
static_cast<std::uint8_t>((payload >> 8) & 0xFFu), static_cast<std::uint8_t>(payload & 0xFFu)
});
input.insert(input.end(), payload, 0x01);
utils::append_valueless_array(input, 'Z', count);