diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2008-05-22 16:36:09 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2008-06-06 12:25:26 +0200 |
| commit | db2765e7d655974bb8b64c3be3bdfc7bc925d9ca (patch) | |
| tree | 2a0cc34ff4a7208a4eae8b442f08b9e2ea083a25 /cpp | |
| parent | Fixed bug 3224 - Fixed more absolute path in slice2cpp generated headers (diff) | |
| download | ice-db2765e7d655974bb8b64c3be3bdfc7bc925d9ca.tar.bz2 ice-db2765e7d655974bb8b64c3be3bdfc7bc925d9ca.tar.xz ice-db2765e7d655974bb8b64c3be3bdfc7bc925d9ca.zip | |
Fix #2 for bug 3224 - Fixed bogus absolute paths from headers generated by slice2freeze
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/Slice/Util.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/cpp/src/Slice/Util.cpp b/cpp/src/Slice/Util.cpp index cdda7b7710f..a74c865ea7c 100644 --- a/cpp/src/Slice/Util.cpp +++ b/cpp/src/Slice/Util.cpp @@ -167,6 +167,15 @@ Slice::changeInclude(const string& orig, const vector<string>& includePaths) } } + if(result == file) + { + // + // Don't return a full path if we couldn't reduce the given path, instead + // return the normalized given path. + // + result = normalizePath(orig); + } + string::size_type pos; if((pos = result.rfind('.')) != string::npos) { |