diff options
author | Jose <jose@zeroc.com> | 2019-06-22 00:29:53 +0200 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2019-06-22 00:29:53 +0200 |
commit | c5959fd09de61604bedd75354401df6a57395d65 (patch) | |
tree | 3b0227f631c8b20fb1a1a274b92f63f52f34af2c /cpp/src/icegriddb/IceGridDB.cpp | |
parent | Small fix (diff) | |
parent | Enable -Wconversion with clang - Close #363 (diff) | |
download | ice-c5959fd09de61604bedd75354401df6a57395d65.tar.bz2 ice-c5959fd09de61604bedd75354401df6a57395d65.tar.xz ice-c5959fd09de61604bedd75354401df6a57395d65.zip |
Merge remote-tracking branch 'origin/3.7' into swift
Diffstat (limited to 'cpp/src/icegriddb/IceGridDB.cpp')
-rw-r--r-- | cpp/src/icegriddb/IceGridDB.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/icegriddb/IceGridDB.cpp b/cpp/src/icegriddb/IceGridDB.cpp index cf6d2c83163..f403d3e94bf 100644 --- a/cpp/src/icegriddb/IceGridDB.cpp +++ b/cpp/src/icegriddb/IceGridDB.cpp @@ -551,10 +551,11 @@ run(const Ice::StringSeq& args) ofstream fs(IceUtilInternal::streamFilename(dbFile).c_str(), ios::binary); if(fs.fail()) { - consoleErr << args[0] << ": could not open output file: " << IceUtilInternal::errorToString(errno) << endl; + consoleErr << args[0] << ": could not open output file: " << IceUtilInternal::errorToString(errno) + << endl; return 1; } - fs.write(reinterpret_cast<const char*>(stream.b.begin()), stream.b.size()); + fs.write(reinterpret_cast<const char*>(stream.b.begin()), static_cast<streamsize>(stream.b.size())); fs.close(); } } |