7 files changed, 15 insertions, 37 deletions
diff --git a/cpp/src/Ice/CommunicatorI.cpp b/cpp/src/Ice/CommunicatorI.cpp
index 86e1fc4fba1..cc61ce97c52 100644
--- a/cpp/src/Ice/CommunicatorI.cpp
+++ b/cpp/src/Ice/CommunicatorI.cpp
@@ -35,9 +35,6 @@ IceUtil::Handle<IceInternal::GC> theCollector = 0;
 
 }
 
-namespace
-{
-
 struct GarbageCollectorStats
 {
     GarbageCollectorStats() :
@@ -50,6 +47,9 @@ struct GarbageCollectorStats
     IceUtil::Time time;
 };
 
+namespace
+{
+
 int communicatorCount = 0;
 IceUtil::Mutex* gcMutex = 0;
 GarbageCollectorStats gcStats;
@@ -77,7 +77,9 @@ public:
 
 Init init;
 
-void
+}
+
+static void
 printGCStats(const IceInternal::GCStats& stats)
 {
     if(gcTraceLevel)
@@ -94,8 +96,6 @@ printGCStats(const IceInternal::GCStats& stats)
     }
 }
 
-}
-
 void
 Ice::CommunicatorI::destroy()
 {
diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp
index 32de59ba16e..84de59104d2 100644
--- a/cpp/src/Ice/ConnectionFactory.cpp
+++ b/cpp/src/Ice/ConnectionFactory.cpp
@@ -1345,7 +1345,7 @@ IceInternal::IncomingConnectionFactory::read(BasicStream&)
     return false;
 }
 
-namespace
+namespace IceInternal
 {
 
 class PromoteFollower
@@ -1385,7 +1385,7 @@ IceInternal::IncomingConnectionFactory::message(BasicStream&, const ThreadPoolPt
         // If _threadPool is null, then this class doesn't do
         // anything.
         //
-        PromoteFollower promote(threadPool);
+        IceInternal::PromoteFollower promote(threadPool);
 
         if(_state != StateActive)
         {
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.
diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp
index a77e098f225..521699474ec 100644
--- a/cpp/src/Ice/Reference.cpp
+++ b/cpp/src/Ice/Reference.cpp
@@ -1830,9 +1830,6 @@ IceInternal::RoutableReference::RoutableReference(const RoutableReference& r) :
 {
 }
 
-namespace
-{
-
 struct EndpointIsOpaque : public unary_function<EndpointIPtr, bool>
 {
 public:
@@ -1844,8 +1841,6 @@ public:
     }
 };
 
-}
-
 vector<EndpointIPtr>
 IceInternal::RoutableReference::filterEndpoints(const vector<EndpointIPtr>& allEndpoints) const
 {
diff --git a/cpp/src/Ice/SliceChecksums.cpp b/cpp/src/Ice/SliceChecksums.cpp
index 122d01a4be9..5e5b9f5fd73 100644
--- a/cpp/src/Ice/SliceChecksums.cpp
+++ b/cpp/src/Ice/SliceChecksums.cpp
@@ -14,11 +14,10 @@
 using namespace std;
 using namespace Ice;
 
+static SliceChecksumDict* _sliceChecksums = 0;
 namespace
 {
 
-SliceChecksumDict* _sliceChecksums = 0;
-
 IceUtil::Mutex* _mutex = 0;
 
 class Init
@@ -39,6 +38,8 @@ public:
 
 Init init;
 
+}
+
 class SliceChecksumDictDestroyer
 {
 public:
@@ -49,10 +50,7 @@ public:
         _sliceChecksums = 0;
     }
 };
-
-SliceChecksumDictDestroyer destroyer;
-
-}
+static SliceChecksumDictDestroyer destroyer;
 
 SliceChecksumDict
 Ice::sliceChecksums()
diff --git a/cpp/src/IcePatch2/ClientUtil.cpp b/cpp/src/IcePatch2/ClientUtil.cpp
index 364be6b8190..ede41b15399 100644
--- a/cpp/src/IcePatch2/ClientUtil.cpp
+++ b/cpp/src/IcePatch2/ClientUtil.cpp
@@ -199,9 +199,6 @@ IcePatch2::Patcher::~Patcher()
 {
 }
 
-namespace
-{
-
 class PatcherGetFileInfoSeqCB : public GetFileInfoSeqCB
 {
 public:
@@ -294,8 +291,6 @@ private:
 
 typedef IceUtil::Handle<AMIGetFileInfoSeq> AMIGetFileInfoSeqPtr;
 
-}
-
 bool
 IcePatch2::Patcher::prepare()
 {
@@ -719,9 +714,6 @@ IcePatch2::Patcher::updateFiles(const FileInfoSeq& files)
     return result;
 }
 
-namespace
-{
-
 class AMIGetFileCompressed : public AMI_FileServer_getFileCompressed, public IceUtil::Monitor<IceUtil::Mutex>
 {
 public:
@@ -782,8 +774,6 @@ private:
 
 typedef IceUtil::Handle<AMIGetFileCompressed> AMIGetFileCompressedPtr;
 
-}
-
 bool
 IcePatch2::Patcher::updateFilesInternal(const FileInfoSeq& files, const DecompressorPtr& decompressor)
 {
diff --git a/cpp/src/IceUtil/UUID.cpp b/cpp/src/IceUtil/UUID.cpp
index 0748670d2fa..917609685e3 100644
--- a/cpp/src/IceUtil/UUID.cpp
+++ b/cpp/src/IceUtil/UUID.cpp
@@ -56,9 +56,6 @@ PidInitializer pidInitializer;
 };
 #endif
 
-namespace
-{
-
 // Helper char to hex functions
 //
 inline void halfByteToHex(unsigned char hb, char*& hexBuffer)
@@ -82,8 +79,6 @@ inline void bytesToHex(unsigned char* bytes, size_t len, char*& hexBuffer)
     }
 }
 
-}
-
 string
 IceUtil::generateUUID()
 {