diff options
| author | Bernard Normier <bernard@zeroc.com> | 2017-03-28 17:09:13 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2017-03-28 17:09:13 -0400 |
| commit | 1aecc966db0271576d8fe0584cd4566fb6a5c910 (patch) | |
| tree | 07d83497f28b21bc2d7ad4584f00fca53be60648 /cpp/src | |
| parent | Expect.py script fixes (diff) | |
| download | ice-1aecc966db0271576d8fe0584cd4566fb6a5c910.tar.bz2 ice-1aecc966db0271576d8fe0584cd4566fb6a5c910.tar.xz ice-1aecc966db0271576d8fe0584cd4566fb6a5c910.zip | |
New initialize overloads that take a configFile instead of initData
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/Application.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/cpp/src/Ice/Application.cpp b/cpp/src/Ice/Application.cpp index 0d817c55ada..c689b453fbb 100644 --- a/cpp/src/Ice/Application.cpp +++ b/cpp/src/Ice/Application.cpp @@ -416,17 +416,7 @@ Ice::Application::doMain(int argc, char* argv[], const InitializationData& initD setProcessLogger(ICE_MAKE_SHARED(LoggerI, initData.properties->getProperty("Ice.ProgramName"), "", convert)); } - if(argc >= 0) - { - _communicator = initialize(argc, argv, initData, version); - } - else - { - // - // argc < 0 means use arg-less version of initialize - // - _communicator = initialize(initData, version); - } + _communicator = initialize(argc, argv, initData, version); _destroyed = false; // |