From 3af793bd59430b2adaa2f89d8867f46010dd0080 Mon Sep 17 00:00:00 2001
From: Matthew Newhook <matthew@zeroc.com>
Date: Fri, 7 Aug 2009 11:10:37 +0800
Subject: Revert "4171 - Global namespace pollution"

This reverts commit 2f63dafe080ad36656d23bfe9c581e45d714be18.
---
 cpp/src/Ice/Initialize.cpp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'cpp/src/Ice/Initialize.cpp')

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.
-- 
cgit v1.2.3