luo980/json
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2756 from nlohmann/issue2755

Browse Source 
replace EOF with std::char_traits<char>::eof()
This commit is contained in:
Niels Lohmann 2021-05-04 12:56:46 +02:00 committed by GitHub
commit fc2f7116fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/nlohmann/detail/input/input_adapters.hpp
View File

@ -105,7 +105,7 @@ class input_stream_adapter
{ {
auto res = sb->sbumpc(); auto res = sb->sbumpc();
// set eof manually, as we don't use the istream interface. // 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); is->clear(is->rdstate() | std::ios::eofbit);
} }

2
single_include/nlohmann/json.hpp
View File

@ -5332,7 +5332,7 @@ class input_stream_adapter
{ {
auto res = sb->sbumpc(); auto res = sb->sbumpc();
// set eof manually, as we don't use the istream interface. // 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); is->clear(is->rdstate() | std::ios::eofbit);
} }