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/Slice/Preprocessor.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/Slice/Preprocessor.cpp')
| -rw-r--r-- | cpp/src/Slice/Preprocessor.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
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; } |