summaryrefslogtreecommitdiff
path: root/cpp/src/icegriddb
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2016-07-08 10:50:18 -0400
committerBernard Normier <bernard@zeroc.com>2016-07-08 10:50:18 -0400
commit3e6c7c189ba3d623845dfc385f143cc49e4be8aa (patch)
tree5e0dfa828891d67c230736a6cf4f5adeb2216097 /cpp/src/icegriddb
parentAdditional UWP fix for ICE-7172 (diff)
downloadice-3e6c7c189ba3d623845dfc385f143cc49e4be8aa.tar.bz2
ice-3e6c7c189ba3d623845dfc385f143cc49e4be8aa.tar.xz
ice-3e6c7c189ba3d623845dfc385f143cc49e4be8aa.zip
Removed IceUtilInternal ifstream and ofstream
Diffstat (limited to 'cpp/src/icegriddb')
-rw-r--r--cpp/src/icegriddb/IceGridDB.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/cpp/src/icegriddb/IceGridDB.cpp b/cpp/src/icegriddb/IceGridDB.cpp
index 55fc370fa8f..71e9e7b6028 100644
--- a/cpp/src/icegriddb/IceGridDB.cpp
+++ b/cpp/src/icegriddb/IceGridDB.cpp
@@ -8,12 +8,15 @@
// **********************************************************************
#include <IceUtil/Options.h>
-#include <Ice/Application.h>
+#include <IceUtil/FileUtil.h>
+#include <Ice/Ice.h>
#include <IceDB/IceDB.h>
#include <IceGrid/Admin.h>
#include <IceGrid/DBTypes.h>
#include <IceUtil/DisableWarnings.h>
+#include <fstream>
+
using namespace std;
using namespace Ice;
using namespace IceGrid;
@@ -264,7 +267,7 @@ Client::run(int argc, char* argv[])
return EXIT_FAILURE;
}
- ifstream fs(dbFile.c_str(), ios::binary);
+ ifstream fs(IceUtilInternal::streamFilename(dbFile), ios::binary);
if(fs.fail())
{
cerr << argv[0] << ": could not open input file: " << strerror(errno) << endl;
@@ -536,7 +539,7 @@ Client::run(int argc, char* argv[])
stream.write(ICE_INT_VERSION);
stream.write(data);
- ofstream fs(dbFile.c_str(), ios::binary);
+ ofstream fs(IceUtilInternal::streamFilename(dbFile), ios::binary);
if(fs.fail())
{
cerr << argv[0] << ": could not open output file: " << strerror(errno) << endl;