diff options
Diffstat (limited to 'cpp/src/Ice/Initialize.cpp')
| -rw-r--r-- | cpp/src/Ice/Initialize.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/cpp/src/Ice/Initialize.cpp b/cpp/src/Ice/Initialize.cpp index ad9462dba2c..da9027b5061 100644 --- a/cpp/src/Ice/Initialize.cpp +++ b/cpp/src/Ice/Initialize.cpp @@ -137,9 +137,6 @@ Ice::createProperties(int& argc, char* argv[], const PropertiesPtr& defaults, co return properties; } -namespace IceInternal -{ - inline void checkIceVersion(Int version) { #ifndef ICE_IGNORE_VERSION @@ -183,12 +180,10 @@ inline void checkIceVersion(Int version) #endif } -} - CommunicatorPtr Ice::initialize(int& argc, char* argv[], const InitializationData& initializationData, Int version) { - IceInternal::checkIceVersion(version); + checkIceVersion(version); InitializationData initData = initializationData; initData.properties = createProperties(argc, argv, initData.properties, initData.stringConverter); @@ -216,7 +211,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. // - IceInternal::checkIceVersion(version); + checkIceVersion(version); CommunicatorI* communicatorI = new CommunicatorI(initData); CommunicatorPtr result = communicatorI; // For exception safety. |