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/Calc.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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

diff --git a/cpp/src/IcePatch2/Calc.cpp b/cpp/src/IcePatch2/Calc.cpp
index 9d2472c2ea4..5212f671236 100644
--- a/cpp/src/IcePatch2/Calc.cpp
+++ b/cpp/src/IcePatch2/Calc.cpp
@@ -12,7 +12,6 @@
 #include <IceUtil/StringUtil.h>
 #include <IceUtil/FileUtil.h>
 #include <IcePatch2/Util.h>
-#include <OS.h>
 
 #ifdef __BCPLUSPLUS__
 #  include <iterator>
@@ -195,7 +194,7 @@ main(int argc, char* argv[])
         string absDataDir = 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