diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2006-08-09 14:58:01 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2006-08-09 14:58:01 +0000 |
| commit | 3f862089b748741b30e343d2051a4747a3bff2f2 (patch) | |
| tree | 18d1dde1504e2d510a24f4d55aeee21bfea7c04f /cpp/src/FreezeScript/transformdb.cpp | |
| parent | fixing bug 1291 (diff) | |
| download | ice-3f862089b748741b30e343d2051a4747a3bff2f2.tar.bz2 ice-3f862089b748741b30e343d2051a4747a3bff2f2.tar.xz ice-3f862089b748741b30e343d2051a4747a3bff2f2.zip | |
Borland C++Builder port mass commit
Diffstat (limited to 'cpp/src/FreezeScript/transformdb.cpp')
| -rw-r--r-- | cpp/src/FreezeScript/transformdb.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/FreezeScript/transformdb.cpp b/cpp/src/FreezeScript/transformdb.cpp index cf38e463bf5..a3f6468529f 100644 --- a/cpp/src/FreezeScript/transformdb.cpp +++ b/cpp/src/FreezeScript/transformdb.cpp @@ -152,7 +152,7 @@ transformDb(bool evictor, const Ice::CommunicatorPtr& communicator, // Execute the transformation descriptors. // istringstream istr(descriptors); - string facet = (name == "$default" ? "" : name); + string facet = (name == "$default" ? string("") : name); FreezeScript::transformDatabase(communicator, objectFactory, oldUnit, newUnit, &db, dbNew, txnNew, 0, dbName, facet, purgeObjects, cerr, suppress, istr); @@ -235,7 +235,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) { |