Merge pull request #2144 from XyFreak/gcc10_type_limits

Fix issue#1939: Cast character to unsigned for comparison

Merge pull request #2144 from XyFreak/gcc10_type_limits
61832afe · Niels Lohmann · GitHub · 5ff4d7b7 · 23051df2 · 61832afe
Unverified Commit 61832afe authored May 28, 2020 by Niels Lohmann Committed by GitHub May 28, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

lexer.hpp include/nlohmann/detail/input/lexer.hpp +1 -1

json.hpp single_include/nlohmann/json.hpp +1 -1

No files found.
--- a/include/nlohmann/detail/input/lexer.hpp
+++ b/include/nlohmann/detail/input/lexer.hpp
@@ -1367,7 +1367,7 @@ scan_number_done:
        std::string result;
        for (const auto c : token_string)
        {
-            if ('\x00' <= c and c <= '\x1F')
+            if (static_cast<unsigned char>(c) <= '\x1F')
            {
                // escape control characters
                std::array<char, 9> cs{{}};

--- a/single_include/nlohmann/json.hpp
+++ b/single_include/nlohmann/json.hpp
@@ -9457,7 +9457,7 @@ scan_number_done:
        std::string result;
        for (const auto c : token_string)
        {
-            if ('\x00' <= c and c <= '\x1F')
+            if (static_cast<unsigned char>(c) <= '\x1F')
            {
                // escape control characters
                std::array<char, 9> cs{{}};