summaryrefslogtreecommitdiff
path: root/cpp/src/FreezeScript/DumpDB.cpp
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2006-08-09 14:58:01 +0000
committerDwayne Boone <dwayne@zeroc.com>2006-08-09 14:58:01 +0000
commit3f862089b748741b30e343d2051a4747a3bff2f2 (patch)
tree18d1dde1504e2d510a24f4d55aeee21bfea7c04f /cpp/src/FreezeScript/DumpDB.cpp
parentfixing bug 1291 (diff)
downloadice-3f862089b748741b30e343d2051a4747a3bff2f2.tar.bz2
ice-3f862089b748741b30e343d2051a4747a3bff2f2.tar.xz
ice-3f862089b748741b30e343d2051a4747a3bff2f2.zip
Borland C++Builder port mass commit
Diffstat (limited to 'cpp/src/FreezeScript/DumpDB.cpp')
-rw-r--r--cpp/src/FreezeScript/DumpDB.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/FreezeScript/DumpDB.cpp b/cpp/src/FreezeScript/DumpDB.cpp
index 135fb269c90..2076bb05676 100644
--- a/cpp/src/FreezeScript/DumpDB.cpp
+++ b/cpp/src/FreezeScript/DumpDB.cpp
@@ -136,7 +136,7 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
vector<string> args;
try
{
- args = opts.parse(argc, argv);
+ args = opts.parse(argc, (const char**)argv);
}
catch(const IceUtil::Options::BadOpt& e)
{
@@ -401,7 +401,7 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
for(vector<string>::iterator p = dbNames.begin(); p != dbNames.end(); ++p)
{
string name = *p;
- string facet = (name == "$default" ? "" : name);
+ string facet = (name == "$default" ? string("") : name);
Db db(&dbEnv, 0);
db.open(txn, dbName.c_str(), name.c_str(), DB_BTREE, DB_RDONLY, FREEZE_SCRIPT_DB_MODE);
descriptor->dump(communicator, &db, txn, facet);