diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-02-01 14:25:17 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-02-01 14:25:17 +0100 |
| commit | 3bb38c886e9dbd636ae39f3b216d0f7a5c43f1e0 (patch) | |
| tree | 0db6754abde6c94529d8bfb876181d800a9047f2 /cpp | |
| parent | Fix argv processing in gulpfile (diff) | |
| download | ice-3bb38c886e9dbd636ae39f3b216d0f7a5c43f1e0.tar.bz2 ice-3bb38c886e9dbd636ae39f3b216d0f7a5c43f1e0.tar.xz ice-3bb38c886e9dbd636ae39f3b216d0f7a5c43f1e0.zip | |
Fixed ICE-7536 - Simplified Ice.Util createProperties/initialize methods
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/include/Ice/Initialize.h | 2 | ||||
| -rw-r--r-- | cpp/src/Ice/Initialize.cpp | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/cpp/include/Ice/Initialize.h b/cpp/include/Ice/Initialize.h index bbf822dff0a..22bb9f5c039 100644 --- a/cpp/include/Ice/Initialize.h +++ b/cpp/include/Ice/Initialize.h @@ -108,7 +108,7 @@ ICE_API CommunicatorPtr initialize(Ice::StringSeq&, const InitializationData& = Int = ICE_INT_VERSION); ICE_API CommunicatorPtr initialize(const InitializationData& = InitializationData(), - Int = ICE_INT_VERSION); + Int = ICE_INT_VERSION); ICE_API LoggerPtr getProcessLogger(); ICE_API void setProcessLogger(const LoggerPtr&); diff --git a/cpp/src/Ice/Initialize.cpp b/cpp/src/Ice/Initialize.cpp index 50b2e10def4..4ce68d5e778 100644 --- a/cpp/src/Ice/Initialize.cpp +++ b/cpp/src/Ice/Initialize.cpp @@ -223,7 +223,6 @@ inline void checkIceVersion(Int version) } - Ice::CommunicatorPtr Ice::initialize(int& argc, char* argv[], const InitializationData& initializationData, Int version) { |