diff options
author | Dwayne Boone <dwayne@zeroc.com> | 2015-10-28 17:12:13 -0230 |
---|---|---|
committer | Dwayne Boone <dwayne@zeroc.com> | 2015-10-28 17:12:13 -0230 |
commit | 8f4803fc0c32a7edf619812be8cb3a66dd16826b (patch) | |
tree | c1c7739d65616c899c9c39a484c59340edaae0b4 /cpp/src/IceGrid/IceGridDB.cpp | |
parent | Travis build fix (diff) | |
download | ice-8f4803fc0c32a7edf619812be8cb3a66dd16826b.tar.bz2 ice-8f4803fc0c32a7edf619812be8cb3a66dd16826b.tar.xz ice-8f4803fc0c32a7edf619812be8cb3a66dd16826b.zip |
Linux build fixes
Diffstat (limited to 'cpp/src/IceGrid/IceGridDB.cpp')
-rw-r--r-- | cpp/src/IceGrid/IceGridDB.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cpp/src/IceGrid/IceGridDB.cpp b/cpp/src/IceGrid/IceGridDB.cpp index bbdb2b0666a..1f6da1362d4 100644 --- a/cpp/src/IceGrid/IceGridDB.cpp +++ b/cpp/src/IceGrid/IceGridDB.cpp @@ -227,7 +227,8 @@ Client::run(int argc, char* argv[]) IceDB::IceContext dbContext; dbContext.communicator = communicator(); - dbContext.encoding = { 1, 1 }; + dbContext.encoding.major = 1; + dbContext.encoding.minor = 1; if(import) { @@ -246,7 +247,7 @@ Client::run(int argc, char* argv[]) return EXIT_FAILURE; } - ifstream fs(dbFile, ios::binary); + ifstream fs(dbFile.c_str(), ios::binary); if(fs.fail()) { cerr << "Could not open input file: " << strerror(errno) << endl; @@ -510,7 +511,7 @@ Client::run(int argc, char* argv[]) stream->write(data); pair<const Ice::Byte*, const Ice::Byte*> buf = stream->finished(); - ofstream fs(dbFile, ios::binary); + ofstream fs(dbFile.c_str(), ios::binary); if(fs.fail()) { cerr << "Could not open output file: " << strerror(errno) << endl; |