summaryrefslogtreecommitdiff
path: root/cpp/src/Slice/Preprocessor.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2016-12-09 10:08:06 -0800
committerJose <jose@zeroc.com>2016-12-09 10:08:06 -0800
commit6014de99054ff67bc886d16a8cf1fcc90374de3a (patch)
tree7828f605fffec2dc6feecb5a8d69a7b0514834db /cpp/src/Slice/Preprocessor.cpp
parentMerge remote-tracking branch 'origin/3.6' (diff)
parentFix for dependency parse updates in previous commit (diff)
downloadice-6014de99054ff67bc886d16a8cf1fcc90374de3a.tar.bz2
ice-6014de99054ff67bc886d16a8cf1fcc90374de3a.tar.xz
ice-6014de99054ff67bc886d16a8cf1fcc90374de3a.zip
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'cpp/src/Slice/Preprocessor.cpp')
-rw-r--r--cpp/src/Slice/Preprocessor.cpp2
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;