diff options
| author | Bernard Normier <bernard@zeroc.com> | 2012-08-21 19:54:54 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2012-08-21 19:54:54 -0400 |
| commit | 8109166007047462d06be0749c00279aa8ace6b2 (patch) | |
| tree | 63a6595d07d1a362bb595e2233e7826d6007ab5b /cpp/src/FreezeScript/transformdb.cpp | |
| parent | Much better fix for ICE-2097: whether or not to keep the stats is no longer (diff) | |
| download | ice-8109166007047462d06be0749c00279aa8ace6b2.tar.bz2 ice-8109166007047462d06be0749c00279aa8ace6b2.tar.xz ice-8109166007047462d06be0749c00279aa8ace6b2.zip | |
Removed --encoding option added earlier today
Diffstat (limited to 'cpp/src/FreezeScript/transformdb.cpp')
| -rwxr-xr-x | cpp/src/FreezeScript/transformdb.cpp | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/cpp/src/FreezeScript/transformdb.cpp b/cpp/src/FreezeScript/transformdb.cpp index 24bfdd71d1e..f4583394b5c 100755 --- a/cpp/src/FreezeScript/transformdb.cpp +++ b/cpp/src/FreezeScript/transformdb.cpp @@ -83,8 +83,6 @@ usage(const std::string& n) "-p Purge objects whose types no longer exist.\n" "-c Use catastrophic recovery on the old database environment.\n" "-w Suppress duplicate warnings during migration.\n" - "--encoding VERSION Set the Ice encoding version for the new database\n" - " environment.\n" "-f FILE Execute the transformation descriptors in the file FILE.\n" ; } @@ -186,8 +184,7 @@ transformDb(bool evictor, const Ice::CommunicatorPtr& communicator, } Freeze::Catalog catalogNew(connectionNew, Freeze::catalogName()); - Freeze::CatalogData catalogData; - catalogData.evictor = true; + Freeze::CatalogData catalogData = { true, "::Ice::Identity", "Object" }; catalogNew.put(Freeze::Catalog::value_type(dbName, catalogData)); } else @@ -234,7 +231,6 @@ run(const Ice::StringSeq& originalArgs, const Ice::CommunicatorPtr& communicator string valueTypeNames; string dbEnvName, dbName, dbEnvNameNew; bool allDb = false; - Ice::EncodingVersion newEncoding = Ice::currentEncoding; IceUtilInternal::Options opts; opts.addOpt("h", "help"); @@ -248,7 +244,6 @@ run(const Ice::StringSeq& originalArgs, const Ice::CommunicatorPtr& communicator opts.addOpt("p"); opts.addOpt("c"); opts.addOpt("w"); - opts.addOpt("", "encoding", IceUtilInternal::Options::NeedArg); opts.addOpt("f", "", IceUtilInternal::Options::NeedArg); opts.addOpt("", "include-old", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat); opts.addOpt("", "include-new", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat); @@ -439,17 +434,6 @@ run(const Ice::StringSeq& originalArgs, const Ice::CommunicatorPtr& communicator } } - if(opts.isSet("encoding")) - { - newEncoding = Ice::stringToEncodingVersion(opts.optArg("encoding")); - - if(!IceInternal::isSupported(newEncoding, Ice::currentEncoding)) - { - cerr << appName << ": " << "unsupported encoding" << endl; - return EXIT_FAILURE; - } - } - Slice::UnitPtr oldUnit = Slice::Unit::createUnit(true, true, ice, underscore); FreezeScript::Destroyer<Slice::UnitPtr> oldD(oldUnit); if(!FreezeScript::parseSlice(appName, oldUnit, oldSlice, oldCppArgs, debug)) |