diff options
| author | Jose <jose@zeroc.com> | 2009-08-04 00:09:36 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2009-08-04 00:09:36 +0200 |
| commit | 06edd41f4521d79844e4012c3e1630a0cadb49f3 (patch) | |
| tree | 4ab5e789489431748c1582f206e6240e5c7ea14d /cpp/src/Ice/Initialize.cpp | |
| parent | initialize integer members of Slice::Unit (diff) | |
| download | ice-06edd41f4521d79844e4012c3e1630a0cadb49f3.tar.bz2 ice-06edd41f4521d79844e4012c3e1630a0cadb49f3.tar.xz ice-06edd41f4521d79844e4012c3e1630a0cadb49f3.zip | |
4171 - Global namespace pollution
Diffstat (limited to 'cpp/src/Ice/Initialize.cpp')
| -rw-r--r-- | cpp/src/Ice/Initialize.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/cpp/src/Ice/Initialize.cpp b/cpp/src/Ice/Initialize.cpp index da9027b5061..ad9462dba2c 100644 --- a/cpp/src/Ice/Initialize.cpp +++ b/cpp/src/Ice/Initialize.cpp @@ -137,6 +137,9 @@ Ice::createProperties(int& argc, char* argv[], const PropertiesPtr& defaults, co return properties; } +namespace IceInternal +{ + inline void checkIceVersion(Int version) { #ifndef ICE_IGNORE_VERSION @@ -180,10 +183,12 @@ inline void checkIceVersion(Int version) #endif } +} + CommunicatorPtr Ice::initialize(int& argc, char* argv[], const InitializationData& initializationData, Int version) { - checkIceVersion(version); + IceInternal::checkIceVersion(version); InitializationData initData = initializationData; initData.properties = createProperties(argc, argv, initData.properties, initData.stringConverter); @@ -211,7 +216,7 @@ Ice::initialize(const InitializationData& initData, Int version) // We can't simply call the other initialize() because this one does NOT read // the config file, while the other one always does. // - checkIceVersion(version); + IceInternal::checkIceVersion(version); CommunicatorI* communicatorI = new CommunicatorI(initData); CommunicatorPtr result = communicatorI; // For exception safety. |