summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth Heafield <github@kheafield.com>2012-05-28 12:33:16 -0400
committerKenneth Heafield <github@kheafield.com>2012-05-28 12:33:16 -0400
commit6b7f7ae44228221b3de158035d190940ff677de1 (patch)
tree98f34ac5b3c9b28b83fd8f156a41861738156872
parent3266cb84f8d26ac6ff38ae53ecc530a9ff978298 (diff)
Fix FilePiece and progress
-rw-r--r--klm/util/file_piece.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/klm/util/file_piece.cc b/klm/util/file_piece.cc
index 081e662b..a205995a 100644
--- a/klm/util/file_piece.cc
+++ b/klm/util/file_piece.cc
@@ -36,13 +36,13 @@ const bool kSpaces[256] = {0,0,0,0,0,0,0,0,0,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0
FilePiece::FilePiece(const char *name, std::ostream *show_progress, std::size_t min_buffer) :
file_(OpenReadOrThrow(name)), total_size_(SizeFile(file_.get())), page_(SizePage()),
- progress_(total_size_ == kBadSize ? NULL : show_progress, std::string("Reading ") + name, total_size_) {
+ progress_(total_size_, total_size_ == kBadSize ? NULL : show_progress, std::string("Reading ") + name) {
Initialize(name, show_progress, min_buffer);
}
FilePiece::FilePiece(int fd, const char *name, std::ostream *show_progress, std::size_t min_buffer) :
file_(fd), total_size_(SizeFile(file_.get())), page_(SizePage()),
- progress_(total_size_ == kBadSize ? NULL : show_progress, std::string("Reading ") + name, total_size_) {
+ progress_(total_size_, total_size_ == kBadSize ? NULL : show_progress, std::string("Reading ") + name) {
Initialize(name, show_progress, min_buffer);
}