From 151035a70bdbfe16ec4fc229a55d085f6996c5e0 Mon Sep 17 00:00:00 2001 From: Mark Spruiell Date: Thu, 1 May 2014 15:40:53 -0700 Subject: more FreezeScript changes --- cpp/src/FreezeScript/DumpDB.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'cpp/src/FreezeScript/DumpDB.cpp') 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 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) { -- cgit v1.2.3