From a9169f12e8417b91a7dcfea3b678d09ed2697b62 Mon Sep 17 00:00:00 2001
From: Dwayne Boone <dwayne@zeroc.com>
Date: Fri, 6 Jun 2008 12:46:58 -0230
Subject: Bug 3014 - isAbsolute incorrect

---
 cpp/src/IcePatch2/Calc.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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

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;
             }
-- 
cgit v1.2.3