diff options
author | Mark Spruiell <mes@zeroc.com> | 2014-05-01 15:40:53 -0700 |
---|---|---|
committer | Mark Spruiell <mes@zeroc.com> | 2014-05-01 15:40:53 -0700 |
commit | 151035a70bdbfe16ec4fc229a55d085f6996c5e0 (patch) | |
tree | 271006efcc84417ec397acc0181262d46b86537a /cpp/src/FreezeScript/DumpDB.cpp | |
parent | Fixed (ICE-5529) - Fix slice2freeze, slice2freezej and slice2html predefined ... (diff) | |
download | ice-151035a70bdbfe16ec4fc229a55d085f6996c5e0.tar.bz2 ice-151035a70bdbfe16ec4fc229a55d085f6996c5e0.tar.xz ice-151035a70bdbfe16ec4fc229a55d085f6996c5e0.zip |
more FreezeScript changes
Diffstat (limited to 'cpp/src/FreezeScript/DumpDB.cpp')
-rw-r--r-- | cpp/src/FreezeScript/DumpDB.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/cpp/src/FreezeScript/DumpDB.cpp b/cpp/src/FreezeScript/DumpDB.cpp index 9acc5846da4..f1eb24508c0 100644 --- a/cpp/src/FreezeScript/DumpDB.cpp +++ b/cpp/src/FreezeScript/DumpDB.cpp @@ -126,7 +126,8 @@ printCatalogData(const string& dbName, const Freeze::CatalogData& data) } static int -run(const Ice::StringSeq& originalArgs, const Ice::CommunicatorPtr& communicator) +run(const Ice::StringSeq& originalArgs, const Ice::CommunicatorPtr& communicator, + const FreezeScript::CompactIdResolverIPtr& resolver) { vector<string> cppArgs; bool debug; @@ -350,6 +351,8 @@ run(const Ice::StringSeq& originalArgs, const Ice::CommunicatorPtr& communicator FreezeScript::createEvictorSliceTypes(unit); + FreezeScript::collectCompactIds(unit, resolver); + // // If no input file was provided, then we need to generate default descriptors. // @@ -653,12 +656,17 @@ main(int argc, char* argv[]) Ice::StringSeq args = Ice::argsToStringSeq(argc, argv); assert(args.size() > 0); const string appName = args[0]; + + Ice::InitializationData initData; + FreezeScript::CompactIdResolverIPtr resolver = new FreezeScript::CompactIdResolverI; + initData.compactIdResolver = resolver; + Ice::CommunicatorPtr communicator; int status = EXIT_SUCCESS; try { - communicator = Ice::initialize(args); - status = run(args, communicator); + communicator = Ice::initialize(args, initData); + status = run(args, communicator, resolver); } catch(const FreezeScript::FailureException& ex) { |