diff options
author | Jose <jose@zeroc.com> | 2009-08-12 17:59:22 +0200 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2009-08-12 17:59:22 +0200 |
commit | e33a0af8f6fef372c9f8bec22629b1460d2e8c70 (patch) | |
tree | 67c9e68437084d255a3725dd08092f5892023b26 /cpp/src/IcePatch2/Calc.cpp | |
parent | 2564 - removeServantLocator remaining issues. (diff) | |
download | ice-e33a0af8f6fef372c9f8bec22629b1460d2e8c70.tar.bz2 ice-e33a0af8f6fef372c9f8bec22629b1460d2e8c70.tar.xz ice-e33a0af8f6fef372c9f8bec22629b1460d2e8c70.zip |
4071 - merge contents of OS.cpp/OS.h into FileUtil.h/FileUtil.cpp.
Diffstat (limited to 'cpp/src/IcePatch2/Calc.cpp')
-rw-r--r-- | cpp/src/IcePatch2/Calc.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
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(); } |