moses-smt/mosesdecoder
1
1
Fork 0
mirror of https://github.com/moses-smt/mosesdecoder.git synced 2025-01-06 19:49:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

Implicit casting from FILE* to gzFile_s* does not work anymore since gzFile has been changed from void * to gzFile_s * in zlib-1.2.6.

Browse Source
This commit is contained in:
Christian Federmann 2012-05-09 20:55:55 +02:00
parent d62f301345
commit 73180ae9a2
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/training/lexical-reordering/reordering_classes.cpp
View File

@ -380,10 +380,10 @@ void Model::zipFile()
char inbuffer[128];
int num_read;
while ((num_read = fread(inbuffer, 1, sizeof(inbuffer), file)) > 0) {
gzwrite(gzfile, inbuffer, num_read);
gzwrite((gzFile)gzfile, inbuffer, num_read);
}
fclose(file);
gzclose(gzfile);
gzclose((gzFile)gzfile);
//Remove the unzipped file
remove(filename.c_str());

6
util/file_piece.cc
View File

@ -31,7 +31,7 @@ ParseNumberException::ParseNumberException(StringPiece value) throw() {
GZException::GZException(void *file) {
#ifdef HAVE_ZLIB
int num;
*this << gzerror(file, &num) << " from zlib";
*this << gzerror((gzFile)file, &num) << " from zlib";
#endif // HAVE_ZLIB
}
@ -56,7 +56,7 @@ FilePiece::~FilePiece() {
// zlib took ownership
file_.release();
int ret;
if (Z_OK != (ret = gzclose(gz_file_))) {
if (Z_OK != (ret = gzclose((gzFile)gz_file_))) {
std::cerr << "could not close file " << file_name_ << " using zlib" << std::endl;
abort();
}
@ -295,7 +295,7 @@ void FilePiece::ReadShift() {
ssize_t read_return;
#ifdef HAVE_ZLIB
read_return = gzread(gz_file_, static_cast<char*>(data_.get()) + already_read, default_map_size_ - already_read);
read_return = gzread((gzFile)gz_file_, static_cast<char*>(data_.get()) + already_read, default_map_size_ - already_read);
if (read_return == -1) throw GZException(gz_file_);
if (total_size_ != kBadSize) {
// Just get the position, don't actually seek. Apparently this is how you do it. . .