diff options
| author | Jose <jose@zeroc.com> | 2019-06-22 00:29:53 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2019-06-22 00:29:53 +0200 |
| commit | c5959fd09de61604bedd75354401df6a57395d65 (patch) | |
| tree | 3b0227f631c8b20fb1a1a274b92f63f52f34af2c /cpp/src/Slice/Preprocessor.cpp | |
| parent | Small fix (diff) | |
| parent | Enable -Wconversion with clang - Close #363 (diff) | |
| download | ice-c5959fd09de61604bedd75354401df6a57395d65.tar.bz2 ice-c5959fd09de61604bedd75354401df6a57395d65.tar.xz ice-c5959fd09de61604bedd75354401df6a57395d65.zip | |
Merge remote-tracking branch 'origin/3.7' into swift
Diffstat (limited to 'cpp/src/Slice/Preprocessor.cpp')
| -rw-r--r-- | cpp/src/Slice/Preprocessor.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/Slice/Preprocessor.cpp b/cpp/src/Slice/Preprocessor.cpp index 30430304020..958facf5f34 100644 --- a/cpp/src/Slice/Preprocessor.cpp +++ b/cpp/src/Slice/Preprocessor.cpp @@ -469,7 +469,8 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons { if(file.compare(0, p->length(), *p) == 0) { - string s = includePaths[p - fullIncludePaths.begin()] + file.substr(p->length()); + string s = includePaths[static_cast<size_t>(p - fullIncludePaths.begin())] + + file.substr(p->length()); if(IceUtilInternal::isAbsolutePath(newFile) || s.size() < newFile.size()) { newFile = s; |