diff options
| author | Patrick Simianer <simianer@cl.uni-heidelberg.de> | 2012-05-31 13:57:24 +0200 |
|---|---|---|
| committer | Patrick Simianer <simianer@cl.uni-heidelberg.de> | 2012-05-31 13:57:24 +0200 |
| commit | 6f6601111710aa67eee5169e5b7d89102cc33bb8 (patch) | |
| tree | 0872544abd6bc76162f3f80eb3920999afbf2c34 /klm/util/file_piece.cc | |
| parent | 8cee8b565a9c56a7732365e9563f52ff3c4ff7fd (diff) | |
| parent | 090a64e73f94a6a35e5364a9d416dcf75c0a2938 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'klm/util/file_piece.cc')
| -rw-r--r-- | klm/util/file_piece.cc | 4 |
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); } |