summaryrefslogtreecommitdiff
path: root/cpp/src/slice2js/Gen.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2016-10-20 17:14:09 +0200
committerJose <jose@zeroc.com>2016-10-20 17:14:09 +0200
commite4b33a5da820441fb4d320433f2493cfc989e978 (patch)
tree59e124199134faf523fd479d8639b748ef452ba5 /cpp/src/slice2js/Gen.cpp
parentNuget package version update (diff)
downloadice-e4b33a5da820441fb4d320433f2493cfc989e978.tar.bz2
ice-e4b33a5da820441fb4d320433f2493cfc989e978.tar.xz
ice-e4b33a5da820441fb4d320433f2493cfc989e978.zip
Fix slice2js relative path computation
Diffstat (limited to 'cpp/src/slice2js/Gen.cpp')
-rw-r--r--cpp/src/slice2js/Gen.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/slice2js/Gen.cpp b/cpp/src/slice2js/Gen.cpp
index 764ac2a81fd..e685b622006 100644
--- a/cpp/src/slice2js/Gen.cpp
+++ b/cpp/src/slice2js/Gen.cpp
@@ -950,7 +950,7 @@ relativePath(string p1, string p2)
vector<string>::const_iterator i1 = tokens1.begin();
vector<string>::const_iterator i2 = tokens2.begin();
- while(*i1 == *i2 && i1 != tokens1.end() && i2 != tokens2.end())
+ while(i1 != tokens1.end() && i2 != tokens2.end() && *i1 == *i2)
{
i1++;
i2++;