summaryrefslogtreecommitdiff
path: root/cpp/tools/icegriddb/IceGridDB.cpp
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2015-10-28 17:15:52 -0230
committerDwayne Boone <dwayne@zeroc.com>2015-10-28 17:15:52 -0230
commit8d86601ae7588d44868df2593e1d8da8dbbc7ee2 (patch)
tree08c9f109913aedb1550889628d792eec4545ed46 /cpp/tools/icegriddb/IceGridDB.cpp
parentAdded IceGrid/IceStorm database import/export tools (diff)
downloadice-8d86601ae7588d44868df2593e1d8da8dbbc7ee2.tar.bz2
ice-8d86601ae7588d44868df2593e1d8da8dbbc7ee2.tar.xz
ice-8d86601ae7588d44868df2593e1d8da8dbbc7ee2.zip
Linux build fixes for DB tools
Diffstat (limited to 'cpp/tools/icegriddb/IceGridDB.cpp')
-rw-r--r--cpp/tools/icegriddb/IceGridDB.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/cpp/tools/icegriddb/IceGridDB.cpp b/cpp/tools/icegriddb/IceGridDB.cpp
index 3e2853a27a1..03bdeb483c9 100644
--- a/cpp/tools/icegriddb/IceGridDB.cpp
+++ b/cpp/tools/icegriddb/IceGridDB.cpp
@@ -128,7 +128,10 @@ Client::run(int argc, char* argv[])
{
IceGrid::AllData data;
- EncodingVersion encoding = { 1, 1 };
+ EncodingVersion encoding;
+ encoding.major = 1;
+ encoding.minor = 1;
+
communicator()->getProperties()->setProperty("Freeze.DbEnv.Registry.DbHome", dbPath);
if(import)
@@ -148,7 +151,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;
@@ -363,7 +366,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;