haraldwolff
/
json
mirror of https://github.com/nlohmann/json.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

🚨 fix warnings

pull/2299/head
Niels Lohmann 2020-07-21 23:00:56 +02:00
parent 8344857764
commit 8b14c9b305
No known key found for this signature in database
GPG Key ID: 7F3CEA63AE251B69
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/nlohmann/detail/input/binary_reader.hpp
View File

@ -2279,7 +2279,7 @@ class binary_reader
success = false;
break;
}
result.push_back(std::char_traits<char_type>::to_char_type(current));
result.push_back(static_cast<typename string_t::value_type>(current));
};
return success;
}

2
include/nlohmann/json.hpp
View File

@ -7507,7 +7507,7 @@ class basic_json
const bool allow_exceptions = true,
const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
{
return from_cbor(ptr, ptr + len, strict, tag_handler);
return from_cbor(ptr, ptr + len, strict, allow_exceptions, tag_handler);
}

4
single_include/nlohmann/json.hpp
View File

@ -8264,7 +8264,7 @@ class binary_reader
success = false;
break;
}
result.push_back(std::char_traits<char_type>::to_char_type(current));
result.push_back(static_cast<typename string_t::value_type>(current));
};
return success;
}
@ -23786,7 +23786,7 @@ class basic_json
const bool allow_exceptions = true,
const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
{
return from_cbor(ptr, ptr + len, strict, tag_handler);
return from_cbor(ptr, ptr + len, strict, allow_exceptions, tag_handler);
}

8
test/src/unit-cbor.cpp
View File

@ -2558,10 +2558,10 @@ TEST_CASE("Tagged values")
SECTION("0xC6..0xD4")
{
for (std::uint8_t b :
{
0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4
})
for (auto b : std::vector<std::uint8_t>
{
0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4
})
{
// add tag to value
auto v_tagged = v;