summaryrefslogtreecommitdiff
path: root/cpp/src/Slice/Preprocessor.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2015-04-13 14:58:28 +0200
committerJose <jose@zeroc.com>2015-04-13 14:58:28 +0200
commit8cff2a828400acb3769b7b05452ac267725086eb (patch)
tree3735ea75f8890fcec71909b0ce4cc616bd14d30a /cpp/src/Slice/Preprocessor.cpp
parentICE-6445 Remove .NET CF support (diff)
downloadice-8cff2a828400acb3769b7b05452ac267725086eb.tar.bz2
ice-8cff2a828400acb3769b7b05452ac267725086eb.tar.xz
ice-8cff2a828400acb3769b7b05452ac267725086eb.zip
Add --depend-file/--depend-xml optinos to all Slice compilers
Diffstat (limited to 'cpp/src/Slice/Preprocessor.cpp')
-rw-r--r--cpp/src/Slice/Preprocessor.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/cpp/src/Slice/Preprocessor.cpp b/cpp/src/Slice/Preprocessor.cpp
index 09cdf23d0cc..e3764d747cf 100644
--- a/cpp/src/Slice/Preprocessor.cpp
+++ b/cpp/src/Slice/Preprocessor.cpp
@@ -287,8 +287,8 @@ Slice::Preprocessor::preprocess(bool keepComments, const string& extraArgs)
}
bool
-Slice::Preprocessor::printMakefileDependencies(Language lang, const vector<string>& includePaths,
- const std::string& extraArgs, const string& cppSourceExt,
+Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, const vector<string>& includePaths,
+ const string& extraArgs, const string& cppSourceExt,
const string& optValue)
{
if(!checkInputFile())
@@ -384,7 +384,7 @@ Slice::Preprocessor::printMakefileDependencies(Language lang, const vector<strin
#endif
pos = unprocessed.find(suffix) + suffix.size();
string result;
- if(lang != JavaXML)
+ if(lang != SliceXML)
{
result = unprocessed.substr(0, pos);
}
@@ -436,7 +436,7 @@ Slice::Preprocessor::printMakefileDependencies(Language lang, const vector<strin
}
}
- if(lang == JavaXML)
+ if(lang == SliceXML)
{
if(result.size() == 0)
{
@@ -477,7 +477,7 @@ Slice::Preprocessor::printMakefileDependencies(Language lang, const vector<strin
}
pos = end;
}
- if(lang == JavaXML)
+ if(lang == SliceXML)
{
result += "\n </source>\n";
}
@@ -549,7 +549,7 @@ Slice::Preprocessor::printMakefileDependencies(Language lang, const vector<strin
}
break;
}
- case JavaXML:
+ case SliceXML:
break;
case Java:
{
@@ -684,7 +684,7 @@ Slice::Preprocessor::printMakefileDependencies(Language lang, const vector<strin
//
// Output result
//
- fputs(result.c_str(), stdout);
+ out << result;
return true;
}