diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2009-06-09 10:51:12 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2009-06-09 10:51:12 -0230 |
| commit | 31e48acdf45e4968b7fe59261a0095d963d71dca (patch) | |
| tree | 7dcf98a7fdd2d3cb629e3a6a314c28bc6197ddf6 /cpp/src/Slice/Preprocessor.cpp | |
| parent | Bug 4064 - Having file include itself == BAD (diff) | |
| download | ice-31e48acdf45e4968b7fe59261a0095d963d71dca.tar.bz2 ice-31e48acdf45e4968b7fe59261a0095d963d71dca.tar.xz ice-31e48acdf45e4968b7fe59261a0095d963d71dca.zip | |
Fixed bug in depednedncy creation
Diffstat (limited to 'cpp/src/Slice/Preprocessor.cpp')
| -rw-r--r-- | cpp/src/Slice/Preprocessor.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Slice/Preprocessor.cpp b/cpp/src/Slice/Preprocessor.cpp index c4ec27452e3..b5c8e7c19c4 100644 --- a/cpp/src/Slice/Preprocessor.cpp +++ b/cpp/src/Slice/Preprocessor.cpp @@ -47,6 +47,7 @@ extern "C" char* mcpp_get_mem_buffer(Outdest od); Slice::Preprocessor::Preprocessor(const string& path, const string& fileName, const vector<string>& args) : _path(path), _fileName(fullPath(fileName)), + _shortFileName(fileName), _args(args), _cppHandle(0) { @@ -348,7 +349,6 @@ Slice::Preprocessor::printMakefileDependencies(Language lang, const vector<strin { fullIncludePaths.push_back(fullPath(*p)); } - string absoluteFileName = fullPath(_fileName); // // Process each dependency. @@ -360,9 +360,9 @@ Slice::Preprocessor::printMakefileDependencies(Language lang, const vector<strin string file = IceUtilInternal::trim(unprocessed.substr(pos, end - pos)); if(IceUtilInternal::isAbsolutePath(file)) { - if(file == absoluteFileName) + if(file == _fileName) { - file = _fileName; + file = _shortFileName; } else { |