From e33a0af8f6fef372c9f8bec22629b1460d2e8c70 Mon Sep 17 00:00:00 2001
From: Jose <jose@zeroc.com>
Date: Wed, 12 Aug 2009 17:59:22 +0200
Subject: 4071 - merge contents of OS.cpp/OS.h into FileUtil.h/FileUtil.cpp.

---
 cpp/src/IcePatch2/Server.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'cpp/src/IcePatch2/Server.cpp')

diff --git a/cpp/src/IcePatch2/Server.cpp b/cpp/src/IcePatch2/Server.cpp
index a007a154c73..2db6d9ec383 100644
--- a/cpp/src/IcePatch2/Server.cpp
+++ b/cpp/src/IcePatch2/Server.cpp
@@ -13,7 +13,6 @@
 #include <Ice/Service.h>
 #include <IcePatch2/FileServerI.h>
 #include <IcePatch2/Util.h>
-#include <OS.h>
 
 using namespace std;
 using namespace Ice;
@@ -125,7 +124,7 @@ IcePatch2::PatcherService::start(int argc, char* argv[])
         if(!IceUtilInternal::isAbsolutePath(dataDir))
         {
             string cwd;
-            if(IceInternal::OS::getcwd(cwd) != 0)
+            if(IceUtilInternal::getcwd(cwd) != 0)
             {
                 throw "cannot get the current directory:\n" + IceUtilInternal::lastErrorToString();
             }
-- 
cgit v1.2.3