summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Initialize.cpp
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2009-08-07 11:10:23 +0800
committerMatthew Newhook <matthew@zeroc.com>2009-08-07 11:10:23 +0800
commit8981bc21c09116fee00bce21fb94a3298c7d8589 (patch)
tree4c1db6f731916f0e11f4c84a8233d397a8836008 /cpp/src/Ice/Initialize.cpp
parentbug 4073 - Freeze.jar not mentioned in CHANGES (diff)
downloadice-8981bc21c09116fee00bce21fb94a3298c7d8589.tar.bz2
ice-8981bc21c09116fee00bce21fb94a3298c7d8589.tar.xz
ice-8981bc21c09116fee00bce21fb94a3298c7d8589.zip
Revert "4071 - Global namespace pollution"
This reverts commit 3fd8c6939b3f79cdb202af3305ea6acc377e247d.
Diffstat (limited to 'cpp/src/Ice/Initialize.cpp')
-rw-r--r--cpp/src/Ice/Initialize.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Ice/Initialize.cpp b/cpp/src/Ice/Initialize.cpp
index 5b2e0b7d387..ad9462dba2c 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
+namespace IceInternal
{
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)
{
- checkIceVersion(version);
+ IceInternal::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.
//
- checkIceVersion(version);
+ IceInternal::checkIceVersion(version);
CommunicatorI* communicatorI = new CommunicatorI(initData);
CommunicatorPtr result = communicatorI; // For exception safety.