diff options
| author | Jose <jose@zeroc.com> | 2009-08-04 22:18:24 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2009-08-04 22:18:24 +0200 |
| commit | 618deb2618ca2698141773f1658071c372d2cd3b (patch) | |
| tree | a09f5965e8bcfea07a305df61505af2c35a71cdf /cpp/src/Ice/Initialize.cpp | |
| parent | bug 4186 - PHP test failure (diff) | |
| download | ice-618deb2618ca2698141773f1658071c372d2cd3b.tar.bz2 ice-618deb2618ca2698141773f1658071c372d2cd3b.tar.xz ice-618deb2618ca2698141773f1658071c372d2cd3b.zip | |
4071 - Global namespace pollution
Diffstat (limited to 'cpp/src/Ice/Initialize.cpp')
| -rw-r--r-- | cpp/src/Ice/Initialize.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Ice/Initialize.cpp b/cpp/src/Ice/Initialize.cpp index ad9462dba2c..5b2e0b7d387 100644 --- a/cpp/src/Ice/Initialize.cpp +++ b/cpp/src/Ice/Initialize.cpp @@ -137,7 +137,7 @@ Ice::createProperties(int& argc, char* argv[], const PropertiesPtr& defaults, co return properties; } -namespace IceInternal +namespace { inline void checkIceVersion(Int version) @@ -188,7 +188,7 @@ inline void checkIceVersion(Int version) 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 +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. // - IceInternal::checkIceVersion(version); + checkIceVersion(version); CommunicatorI* communicatorI = new CommunicatorI(initData); CommunicatorPtr result = communicatorI; // For exception safety. |