diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2008-06-06 12:46:58 -0230 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2008-06-06 17:54:49 +0200 |
| commit | a9169f12e8417b91a7dcfea3b678d09ed2697b62 (patch) | |
| tree | 2e072cc1d8319a7ce213590e9e15c719f5b29ab9 /cpp/src/IcePatch2/Calc.cpp | |
| parent | - Fixed bug 3242 (diff) | |
| download | ice-a9169f12e8417b91a7dcfea3b678d09ed2697b62.tar.bz2 ice-a9169f12e8417b91a7dcfea3b678d09ed2697b62.tar.xz ice-a9169f12e8417b91a7dcfea3b678d09ed2697b62.zip | |
Bug 3014 - isAbsolute incorrect
Diffstat (limited to 'cpp/src/IcePatch2/Calc.cpp')
| -rw-r--r-- | cpp/src/IcePatch2/Calc.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/IcePatch2/Calc.cpp b/cpp/src/IcePatch2/Calc.cpp index 46d4d11d51c..9ed422548da 100644 --- a/cpp/src/IcePatch2/Calc.cpp +++ b/cpp/src/IcePatch2/Calc.cpp @@ -10,6 +10,7 @@ #include <IceUtil/Options.h> #include <IceUtil/Unicode.h> #include <IceUtil/StringUtil.h> +#include <IceUtil/FileUtil.h> #include <IcePatch2/Util.h> #include <OS.h> @@ -195,14 +196,14 @@ main(int argc, char* argv[]) throw "cannot get the current directory:\n" + IceUtilInternal::lastErrorToString(); } - if(!isAbsolute(absDataDir)) + if(!IceUtilInternal::isAbsolutePath(absDataDir)) { absDataDir = simplify(cwd + '/' + absDataDir); } for(p = fileSeq.begin(); p != fileSeq.end(); ++p) { - if(!isAbsolute(*p)) + if(!IceUtilInternal::isAbsolutePath(*p)) { *p = cwd + '/' + *p; } |