From c7282d5b1e8d30bfc0dcbca05bf8d89cdc004e63 Mon Sep 17 00:00:00 2001
From: Francois Chabot <francois@ageofminds.com>
Date: Thu, 20 Feb 2020 10:19:29 -0500
Subject: [PATCH] simpler endian detection for older gcc versions
---
.../nlohmann/detail/input/binary_reader.hpp | 26 +++++++++--------
.../nlohmann/detail/output/binary_writer.hpp | 2 +-
single_include/nlohmann/json.hpp | 28 ++++++++++---------
3 files changed, 30 insertions(+), 26 deletions(-)
diff --git a/include/nlohmann/detail/input/binary_reader.hpp b/include/nlohmann/detail/input/binary_reader.hpp
index d0068c4f..0fa60965 100644
--- a/include/nlohmann/detail/input/binary_reader.hpp
+++ b/include/nlohmann/detail/input/binary_reader.hpp
@@ -24,6 +24,20 @@ namespace nlohmann
{
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 //
///////////////////
@@ -117,18 +131,6 @@ class binary_reader
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:
//////////
// BSON //
diff --git a/include/nlohmann/detail/output/binary_writer.hpp b/include/nlohmann/detail/output/binary_writer.hpp
index 01cd104d..76a2b218 100644
--- a/include/nlohmann/detail/output/binary_writer.hpp
+++ b/include/nlohmann/detail/output/binary_writer.hpp
@@ -1326,7 +1326,7 @@ class binary_writer
private:
/// 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
output_adapter_t<CharType> oa = nullptr;
diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
index be12b965..a587f954 100644
--- a/single_include/nlohmann/json.hpp
+++ b/single_include/nlohmann/json.hpp
@@ -5214,6 +5214,20 @@ namespace nlohmann
{
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 //
///////////////////
@@ -5307,18 +5321,6 @@ class binary_reader
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:
//////////
// BSON //
@@ -12674,7 +12676,7 @@ class binary_writer
private:
/// 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
output_adapter_t<CharType> oa = nullptr;