diff options
| author | Jose <jose@zeroc.com> | 2016-12-09 09:53:01 -0800 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-12-09 09:53:01 -0800 |
| commit | 1e4506d90d060850344d454636e26850d80b3b28 (patch) | |
| tree | b3ad1dcda12281e443a66c4939a0ec1c6390cbe5 /cpp/src | |
| parent | Fixed script failure (diff) | |
| parent | Fixed (ICE-7464) - bogus dependencies generated with Slice compilers (diff) | |
| download | ice-1e4506d90d060850344d454636e26850d80b3b28.tar.bz2 ice-1e4506d90d060850344d454636e26850d80b3b28.tar.xz ice-1e4506d90d060850344d454636e26850d80b3b28.zip | |
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Slice/Preprocessor.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cpp/src/Slice/Preprocessor.cpp b/cpp/src/Slice/Preprocessor.cpp index 57d5ed5f78f..5b7d389d9ee 100644 --- a/cpp/src/Slice/Preprocessor.cpp +++ b/cpp/src/Slice/Preprocessor.cpp @@ -382,10 +382,11 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons // First make it a single line. // string::size_type pos; - while((pos = unprocessed.find("\\\n")) != string::npos) + while((pos = unprocessed.find("\\")) != string::npos) { - unprocessed.replace(pos, 2, ""); + unprocessed.replace(pos, 1, ""); } + pos = unprocessed.find("\n", pos) + 1; // // Get the main output file name. @@ -417,9 +418,9 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons vector<string> dependencies; string::size_type end; - while((end = unprocessed.find(".ice", pos)) != string::npos) + while((end = unprocessed.find("\n", pos)) != string::npos) { - end += 4; + end += 1; string file = IceUtilInternal::trim(unprocessed.substr(pos, end - pos)); if(IceUtilInternal::isAbsolutePath(file)) { |