diff options
| author | Jose <jose@zeroc.com> | 2016-12-09 10:08:06 -0800 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-12-09 10:08:06 -0800 |
| commit | 6014de99054ff67bc886d16a8cf1fcc90374de3a (patch) | |
| tree | 7828f605fffec2dc6feecb5a8d69a7b0514834db /cpp | |
| parent | Merge remote-tracking branch 'origin/3.6' (diff) | |
| parent | Fix for dependency parse updates in previous commit (diff) | |
| download | ice-6014de99054ff67bc886d16a8cf1fcc90374de3a.tar.bz2 ice-6014de99054ff67bc886d16a8cf1fcc90374de3a.tar.xz ice-6014de99054ff67bc886d16a8cf1fcc90374de3a.zip | |
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/Slice/Preprocessor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Slice/Preprocessor.cpp b/cpp/src/Slice/Preprocessor.cpp index 5b7d389d9ee..a3229aab6a3 100644 --- a/cpp/src/Slice/Preprocessor.cpp +++ b/cpp/src/Slice/Preprocessor.cpp @@ -386,7 +386,6 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons { unprocessed.replace(pos, 1, ""); } - pos = unprocessed.find("\n", pos) + 1; // // Get the main output file name. @@ -402,6 +401,7 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons { result = unprocessed.substr(0, pos); } + pos = unprocessed.find("\n", pos) + 1; vector<string> fullIncludePaths; |