From bee19ea19c2b6e25045f918cfde1fbccb34eb231 Mon Sep 17 00:00:00 2001 From: Jose Date: Fri, 9 Dec 2016 09:51:28 -0800 Subject: Fixed (ICE-7464) - bogus dependencies generated with Slice compilers --- cpp/src/Slice/Preprocessor.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'cpp/src/Slice/Preprocessor.cpp') diff --git a/cpp/src/Slice/Preprocessor.cpp b/cpp/src/Slice/Preprocessor.cpp index 13a2a5cc4c8..83b574b5a5b 100644 --- a/cpp/src/Slice/Preprocessor.cpp +++ b/cpp/src/Slice/Preprocessor.cpp @@ -368,10 +368,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. @@ -403,9 +404,9 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons vector 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)) { -- cgit v1.2.3