diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2009-08-07 18:01:43 +0800 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2009-08-07 18:01:43 +0800 |
| commit | 5c9e6e5d3d1873ea232bf05ed2f6be8d290c8583 (patch) | |
| tree | 66b739dff9ee9cbdc113a158c30ef80ae84ac218 /cpp/src/Ice/Initialize.cpp | |
| parent | Revert "Changes for bug 3962 and 4714" (diff) | |
| download | ice-5c9e6e5d3d1873ea232bf05ed2f6be8d290c8583.tar.bz2 ice-5c9e6e5d3d1873ea232bf05ed2f6be8d290c8583.tar.xz ice-5c9e6e5d3d1873ea232bf05ed2f6be8d290c8583.zip | |
merged in both of Jose's 4071 fixes.
Diffstat (limited to 'cpp/src/Ice/Initialize.cpp')
| -rw-r--r-- | cpp/src/Ice/Initialize.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cpp/src/Ice/Initialize.cpp b/cpp/src/Ice/Initialize.cpp index e950b960bb1..e6804109138 100644 --- a/cpp/src/Ice/Initialize.cpp +++ b/cpp/src/Ice/Initialize.cpp @@ -108,6 +108,9 @@ Ice::createProperties(int& argc, char* argv[], const PropertiesPtr& defaults, co return properties; } +namespace +{ + inline void checkIceVersion(Int version) { #ifndef ICE_IGNORE_VERSION @@ -151,6 +154,8 @@ inline void checkIceVersion(Int version) #endif } +} + CommunicatorPtr Ice::initialize(int& argc, char* argv[], const InitializationData& initializationData, Int version) { |