diff options
| author | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2014-12-05 13:52:40 +0100 |
|---|---|---|
| committer | Andreas Stöckel <andreas@somweyr.de> | 2014-12-05 13:52:40 +0100 |
| commit | ddbea4164e126739f39658627c04e7e23b71e090 (patch) | |
| tree | bdac63cf2a1c73fd3f67fa03fc821ef4eaf93b83 /src/core/BufferedCharReader.cpp | |
| parent | 3d6058315f7f0da9994e35c144d0acb76a252472 (diff) | |
| parent | 9cb01624a4efe2063d5870f41e033476d9368b6d (diff) | |
fixed conflict
Diffstat (limited to 'src/core/BufferedCharReader.cpp')
| -rw-r--r-- | src/core/BufferedCharReader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/BufferedCharReader.cpp b/src/core/BufferedCharReader.cpp index cf481df..23c219a 100644 --- a/src/core/BufferedCharReader.cpp +++ b/src/core/BufferedCharReader.cpp @@ -224,7 +224,7 @@ void BufferedCharReader::resetPeek() peekCursor.assign(readCursor); } -bool BufferedCharReader::atEnd() +bool BufferedCharReader::atEnd() const { if (depleted || !inputStream) { if (buffer.size() <= 0) { |