summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Initialize.cpp
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2005-10-12 02:23:00 +0000
committerMatthew Newhook <matthew@zeroc.com>2005-10-12 02:23:00 +0000
commit2a52a8fca98c1b3f5549f56a5d89356023699cb2 (patch)
tree6577c0dafdaf817d458adc092747f5c7a815aca5 /cpp/src/Ice/Initialize.cpp
parenthttp://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=87 (diff)
downloadice-2a52a8fca98c1b3f5549f56a5d89356023699cb2.tar.bz2
ice-2a52a8fca98c1b3f5549f56a5d89356023699cb2.tar.xz
ice-2a52a8fca98c1b3f5549f56a5d89356023699cb2.zip
http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=87
Diffstat (limited to 'cpp/src/Ice/Initialize.cpp')
-rw-r--r--cpp/src/Ice/Initialize.cpp18
1 files changed, 16 insertions, 2 deletions
diff --git a/cpp/src/Ice/Initialize.cpp b/cpp/src/Ice/Initialize.cpp
index b7d5a0246ed..733e3e278ac 100644
--- a/cpp/src/Ice/Initialize.cpp
+++ b/cpp/src/Ice/Initialize.cpp
@@ -151,12 +151,26 @@ CommunicatorPtr
Ice::initialize(int& argc, char* argv[], Int version)
{
PropertiesPtr properties = getDefaultProperties(argc, argv);
- return initializeWithProperties(argc, argv, properties, version);
+ return initializeWithPropertiesAndLogger(argc, argv, properties, 0, version);
}
CommunicatorPtr
Ice::initializeWithProperties(int& argc, char* argv[], const PropertiesPtr& properties, Int version)
{
+ return initializeWithPropertiesAndLogger(argc, argv, properties, 0, version);
+}
+
+CommunicatorPtr
+Ice::initializeWithLogger(int& argc, char* argv[], const LoggerPtr& logger, Int version)
+{
+ PropertiesPtr properties = getDefaultProperties(argc, argv);
+ return initializeWithPropertiesAndLogger(argc, argv, properties, logger, version);
+}
+
+CommunicatorPtr
+Ice::initializeWithPropertiesAndLogger(int& argc, char* argv[], const PropertiesPtr& properties,
+ const LoggerPtr& logger, Int version)
+{
#ifndef ICE_IGNORE_VERSION
//
// Major and minor version numbers must match.
@@ -179,7 +193,7 @@ Ice::initializeWithProperties(int& argc, char* argv[], const PropertiesPtr& prop
args = properties->parseIceCommandLineOptions(args);
stringSeqToArgs(args, argc, argv);
- CommunicatorI* communicatorI = new CommunicatorI(properties);
+ CommunicatorI* communicatorI = new CommunicatorI(properties, logger);
CommunicatorPtr result = communicatorI; // For exception safety.
communicatorI->finishSetup(argc, argv);
return result;