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/Slice/Preprocessor.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'cpp/src/Slice/Preprocessor.cpp')

diff --git a/cpp/src/Slice/Preprocessor.cpp b/cpp/src/Slice/Preprocessor.cpp
index fb7bef59d16..763b8a7a855 100644
--- a/cpp/src/Slice/Preprocessor.cpp
+++ b/cpp/src/Slice/Preprocessor.cpp
@@ -12,6 +12,7 @@
 #include <Slice/Util.h>
 #include <Slice/SignalHandler.h>
 #include <IceUtil/StringUtil.h>
+#include <IceUtil/FileUtil.h>
 #include <IceUtil/UUID.h>
 #include <IceUtil/Unicode.h>
 #include <algorithm>
@@ -295,7 +296,7 @@ Slice::Preprocessor::printMakefileDependencies(Language lang, const vector<strin
     {
         end += 4;
         string file = IceUtilInternal::trim(unprocessed.substr(pos, end - pos));
-        if(isAbsolute(file))
+        if(IceUtilInternal::isAbsolutePath(file))
         {
             if(file == absoluteFileName)
             {
@@ -313,7 +314,7 @@ Slice::Preprocessor::printMakefileDependencies(Language lang, const vector<strin
                     if(file.compare(0, p->length(), *p) == 0)
                     {
                         string s = includePaths[p - fullIncludePaths.begin()] + file.substr(p->length());
-                        if(isAbsolute(newFile) || s.size() < newFile.size())
+                        if(IceUtilInternal::isAbsolutePath(newFile) || s.size() < newFile.size())
                         {
                             newFile = s;
                         }
-- 
cgit v1.2.3