Merge pull request #2756 from nlohmann/issue2755

replace EOF with std::char_traits<char>::eof()

Merge pull request #2756 from nlohmann/issue2755
replace EOF with std::char_traits<char>::eof()
fc2f7116 · Niels Lohmann · GitHub · d4f44659 · b08139ea · fc2f7116
Unverified Commit fc2f7116 authored May 04, 2021 by Niels Lohmann Committed by GitHub May 04, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

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

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

No files found.
--- a/include/nlohmann/detail/input/input_adapters.hpp
+++ b/include/nlohmann/detail/input/input_adapters.hpp
@@ -105,7 +105,7 @@ class input_stream_adapter
    {
        auto res = sb->sbumpc();
        // set eof manually, as we don't use the istream interface.
-        if (JSON_HEDLEY_UNLIKELY(res == EOF))
+        if (JSON_HEDLEY_UNLIKELY(res == std::char_traits<char>::eof()))
        {
            is->clear(is->rdstate() | std::ios::eofbit);
        }

--- a/single_include/nlohmann/json.hpp
+++ b/single_include/nlohmann/json.hpp
@@ -5332,7 +5332,7 @@ class input_stream_adapter
    {
        auto res = sb->sbumpc();
        // set eof manually, as we don't use the istream interface.
-        if (JSON_HEDLEY_UNLIKELY(res == EOF))
+        if (JSON_HEDLEY_UNLIKELY(res == std::char_traits<char>::eof()))
        {
            is->clear(is->rdstate() | std::ios::eofbit);
        }