diff options
| author | Jose <jose@zeroc.com> | 2016-01-05 22:57:56 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-01-05 22:57:56 +0100 |
| commit | a58719c5f34b1e408d12da1f1a5f5f8c9084c1db (patch) | |
| tree | 4e8c7e742dea4050d3e46fedf98533e1f70f92c0 /cpp/src/Slice/Util.cpp | |
| parent | Make intent of previous fix more clear (diff) | |
| download | ice-a58719c5f34b1e408d12da1f1a5f5f8c9084c1db.tar.bz2 ice-a58719c5f34b1e408d12da1f1a5f5f8c9084c1db.tar.xz ice-a58719c5f34b1e408d12da1f1a5f5f8c9084c1db.zip | |
Fix ICE-6953 - Slice include path and / at end of symlink.
Diffstat (limited to 'cpp/src/Slice/Util.cpp')
| -rw-r--r-- | cpp/src/Slice/Util.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/Slice/Util.cpp b/cpp/src/Slice/Util.cpp index f8360f038c1..c3529e4bc13 100644 --- a/cpp/src/Slice/Util.cpp +++ b/cpp/src/Slice/Util.cpp @@ -154,8 +154,9 @@ Slice::fullPath(const string& path) } string -Slice::changeInclude(const string& path, const vector<string>& includePaths) +Slice::changeInclude(const string& p, const vector<string>& includePaths) { + string path = normalizePath(p); // // Compare each include path against the included file and select // the path that produces the shortest relative filename. |