j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1489 from andreas-schwab/develop

Browse source 
Do proper endian conversions
This commit is contained in:
Niels Lohmann 2019-03-13 11:57:58 +01:00 • committed by GitHub
commit c6fc902184
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1853,7 +1853,7 @@ class binary_reader
}
// reverse byte order prior to conversion if necessary
if (is_little_endian && !InputIsLittleEndian)
if (is_little_endian != InputIsLittleEndian)
{
vec[sizeof(NumberType) - i - 1] = static_cast<uint8_t>(current);
}

2
include/nlohmann/detail/output/binary_writer.hpp
View file

@ -1278,7 +1278,7 @@ class binary_writer
std::memcpy(vec.data(), &n, sizeof(NumberType));
// step 2: write array to output (with possible reordering)
if (is_little_endian and not OutputIsLittleEndian)
if (is_little_endian != OutputIsLittleEndian)
{
// reverse byte order prior to conversion if necessary
std::reverse(vec.begin(), vec.end());