diff options
author | Mark Spruiell <mes@zeroc.com> | 2006-07-04 13:25:30 +0000 |
---|---|---|
committer | Mark Spruiell <mes@zeroc.com> | 2006-07-04 13:25:30 +0000 |
commit | 54ad0632613b01c01d7418736725749f4053662b (patch) | |
tree | f609437295b17b50b51023b2faf4b86f593ee21d /cpp/src | |
parent | AIX fix (diff) | |
download | ice-54ad0632613b01c01d7418736725749f4053662b.tar.bz2 ice-54ad0632613b01c01d7418736725749f4053662b.tar.xz ice-54ad0632613b01c01d7418736725749f4053662b.zip |
reverting change in 1.42
Diffstat (limited to 'cpp/src')
-rw-r--r-- | cpp/src/Ice/Initialize.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/cpp/src/Ice/Initialize.cpp b/cpp/src/Ice/Initialize.cpp index 58e769449df..16394eaec31 100644 --- a/cpp/src/Ice/Initialize.cpp +++ b/cpp/src/Ice/Initialize.cpp @@ -140,7 +140,7 @@ Ice::initialize(int& argc, char* argv[], const InitializationData& initializatio } CommunicatorPtr -Ice::initialize(const InitializationData& initializationData, Int version) +Ice::initialize(const InitializationData& initData, Int version) { // // We can't simply call the other initialize() because this one does NOT read @@ -148,14 +148,10 @@ Ice::initialize(const InitializationData& initializationData, Int version) // checkIceVersion(version); - int argc = 0; - char* argv[] = { 0 }; - - InitializationData initData = initializationData; - initData.properties = createProperties(argc, argv, initData.properties, initData.stringConverter); - CommunicatorI* communicatorI = new CommunicatorI(initData); CommunicatorPtr result = communicatorI; // For exception safety. + int argc = 0; + char* argv[] = { 0 }; communicatorI->finishSetup(argc, argv); return result; } |