diff options
author | Jose <jose@zeroc.com> | 2009-07-09 14:49:06 +0200 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2009-07-09 14:49:06 +0200 |
commit | 9a269fd25f9fd0122092df49703c572168241ffa (patch) | |
tree | 8924a059efcf3617d9c8051fdf435a4b39e08a20 /cpp/src/Ice/CommunicatorI.cpp | |
parent | fixing VC++ compilation error in StringUtil.cpp (diff) | |
download | ice-9a269fd25f9fd0122092df49703c572168241ffa.tar.bz2 ice-9a269fd25f9fd0122092df49703c572168241ffa.tar.xz ice-9a269fd25f9fd0122092df49703c572168241ffa.zip |
Revert 3965 - new version of Ice::initialize.
Diffstat (limited to 'cpp/src/Ice/CommunicatorI.cpp')
-rw-r--r-- | cpp/src/Ice/CommunicatorI.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/cpp/src/Ice/CommunicatorI.cpp b/cpp/src/Ice/CommunicatorI.cpp index 2a8af012a4f..4d2f9562575 100644 --- a/cpp/src/Ice/CommunicatorI.cpp +++ b/cpp/src/Ice/CommunicatorI.cpp @@ -298,7 +298,7 @@ Ice::CommunicatorI::removeAdminFacet(const string& facet) return _instance->removeAdminFacet(facet); } -Ice::CommunicatorI::CommunicatorI(const InitializationData& initData, char** argv) : _argv(argv) +Ice::CommunicatorI::CommunicatorI(const InitializationData& initData) { __setNoDelete(true); try @@ -358,16 +358,6 @@ Ice::CommunicatorI::~CommunicatorI() Warning out(_instance->initializationData().logger); out << "Ice::Communicator::destroy() has not been called"; } - if(_argv) - { - for(int i = 0; _argv[i] != 0; ++i) - { - free(_argv[i]); - } - free(_argv); - _argv = 0; - } - } void |