summaryrefslogtreecommitdiff
path: root/klm/util/file_piece.cc
diff options
context:
space:
mode:
authorPatrick Simianer <p@simianer.de>2014-01-28 15:35:31 +0100
committerPatrick Simianer <p@simianer.de>2014-01-28 15:35:31 +0100
commitc83f665cb7efbbfb0fdfa12203b09ba60e365d25 (patch)
treed9132aaf35e696a52c5e09430ae2889b033cdacb /klm/util/file_piece.cc
parent85088dc6e09d4e91038aea46e8d20b5c34053b5f (diff)
parent3e22fcc3569a2855f691be4e3ee81f644b926c04 (diff)
resolv conflict in mira
Diffstat (limited to 'klm/util/file_piece.cc')
-rw-r--r--klm/util/file_piece.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/klm/util/file_piece.cc b/klm/util/file_piece.cc
index b5961bea..9c7e00c4 100644
--- a/klm/util/file_piece.cc
+++ b/klm/util/file_piece.cc
@@ -74,7 +74,9 @@ StringPiece FilePiece::ReadLine(char delim) {
}
}
if (at_end_) {
- if (position_ == position_end_) Shift();
+ if (position_ == position_end_) {
+ Shift();
+ }
return Consume(position_end_);
}
skip = position_end_ - position_;