Revert "4171 - Global namespace pollution"

This reverts commit 2f63dafe080ad36656d23bfe9c581e45d714be18.

1 files changed, 4 insertions, 4 deletions

diff --git a/cpp/src/IcePatch2/ClientUtil.cpp b/cpp/src/IcePatch2/ClientUtil.cpp
index ede41b15399..d2198c5d5ba 100644
--- a/cpp/src/IcePatch2/ClientUtil.cpp
+++ b/cpp/src/IcePatch2/ClientUtil.cpp
@@ -454,7 +454,7 @@ IcePatch2::Patcher::prepare()
     sort(_updateFlags.begin(), _updateFlags.end(), FileInfoLess());
                 
     string pathLog = simplify(_dataDir + '/' + logFile);
-    _log = IceInternal::OS::fopen(pathLog, "w");
+    _log = OS::fopen(pathLog, "w");
     if(!_log)
     {
         throw "cannot open `" + pathLog + "' for writing:\n" + IceUtilInternal::lastErrorToString();
@@ -615,7 +615,7 @@ IcePatch2::Patcher::init(const FileServerPrx& server)
     if(!IceUtilInternal::isAbsolutePath(_dataDir))
     {
         string cwd;
-        if(IceInternal::OS::getcwd(cwd) != 0)
+        if(OS::getcwd(cwd) != 0)
         {
             throw "cannot get the current directory:\n" + IceUtilInternal::lastErrorToString();
         }
@@ -813,7 +813,7 @@ IcePatch2::Patcher::updateFilesInternal(const FileInfoSeq& files, const Decompre
             if(p->size == 0)
             {
                 string path = simplify(_dataDir + '/' + p->path);
-                FILE* fp = IceInternal::OS::fopen(path, "wb");
+                FILE* fp = OS::fopen(path, "wb");
                 if(fp == 0)
                 {
                     throw "cannot open `" + path +"' for writing:\n" + IceUtilInternal::lastErrorToString();
@@ -838,7 +838,7 @@ IcePatch2::Patcher::updateFilesInternal(const FileInfoSeq& files, const Decompre
                 {
                 }
                 
-                FILE* fileBZ2 = IceInternal::OS::fopen(pathBZ2, "wb");
+                FILE* fileBZ2 = OS::fopen(pathBZ2, "wb");
                 if(fileBZ2 == 0)
                 {
                     throw "cannot open `" + pathBZ2 + "' for writing:\n" + IceUtilInternal::lastErrorToString();