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

simpler endian detection for older gcc versions

Browse source
This commit is contained in:
Francois Chabot 2020-02-20 10:19:29 -05:00
parent 770ae6e9da
commit c7282d5b1e
3 changed files with 30 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -24,6 +24,20 @@ namespace nlohmann
{ {
namespace detail namespace detail
{ {
/*!
@brief determine system byte order
@return true if and only if system's byte order is little endian
@note from https://stackoverflow.com/a/1001328/266378
*/
static bool little_endianess(int num = 1) noexcept
{
return *reinterpret_cast<char*>(&num) == 1;
}
/////////////////// ///////////////////
// binary reader // // binary reader //
/////////////////// ///////////////////
@ -117,18 +131,6 @@ class binary_reader
return result; return result;
} }
/*!
@brief determine system byte order
@return true if and only if system's byte order is little endian
@note from https://stackoverflow.com/a/1001328/266378
*/
static constexpr bool little_endianess(int num = 1) noexcept
{
return *reinterpret_cast<char*>(&num) == 1;
}
private: private:
////////// //////////
// BSON // // BSON //

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

@ -1326,7 +1326,7 @@ class binary_writer
private: private:
/// whether we can assume little endianess /// whether we can assume little endianess
const bool is_little_endian = binary_reader<BasicJsonType, input_buffer_adapter>::little_endianess(); const bool is_little_endian = little_endianess();
/// the output /// the output
output_adapter_t<CharType> oa = nullptr; output_adapter_t<CharType> oa = nullptr;

28
single_include/nlohmann/json.hpp
View file

@ -5214,6 +5214,20 @@ namespace nlohmann
{ {
namespace detail namespace detail
{ {
/*!
@brief determine system byte order
@return true if and only if system's byte order is little endian
@note from https://stackoverflow.com/a/1001328/266378
*/
static bool little_endianess(int num = 1) noexcept
{
return *reinterpret_cast<char*>(&num) == 1;
}
/////////////////// ///////////////////
// binary reader // // binary reader //
/////////////////// ///////////////////
@ -5307,18 +5321,6 @@ class binary_reader
return result; return result;
} }
/*!
@brief determine system byte order
@return true if and only if system's byte order is little endian
@note from https://stackoverflow.com/a/1001328/266378
*/
static constexpr bool little_endianess(int num = 1) noexcept
{
return *reinterpret_cast<char*>(&num) == 1;
}
private: private:
////////// //////////
// BSON // // BSON //
@ -12674,7 +12676,7 @@ class binary_writer
private: private:
/// whether we can assume little endianess /// whether we can assume little endianess
const bool is_little_endian = binary_reader<BasicJsonType, input_buffer_adapter>::little_endianess(); const bool is_little_endian = little_endianess();
/// the output /// the output
output_adapter_t<CharType> oa = nullptr; output_adapter_t<CharType> oa = nullptr;