rapidjson updated to recent git version.
This commit is contained in:
parent
df559b44d8
commit
7eaf7764f7
28 changed files with 2228 additions and 777 deletions
4
src/3rdparty/rapidjson/filereadstream.h
vendored
4
src/3rdparty/rapidjson/filereadstream.h
vendored
|
@ -59,7 +59,7 @@ public:
|
|||
|
||||
// For encoding detection only.
|
||||
const Ch* Peek4() const {
|
||||
return (current_ + 4 <= bufferLast_) ? current_ : 0;
|
||||
return (current_ + 4 - !eof_ <= bufferLast_) ? current_ : 0;
|
||||
}
|
||||
|
||||
private:
|
||||
|
@ -68,7 +68,7 @@ private:
|
|||
++current_;
|
||||
else if (!eof_) {
|
||||
count_ += readCount_;
|
||||
readCount_ = fread(buffer_, 1, bufferSize_, fp_);
|
||||
readCount_ = std::fread(buffer_, 1, bufferSize_, fp_);
|
||||
bufferLast_ = buffer_ + readCount_ - 1;
|
||||
current_ = buffer_;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue