From 8cff2a828400acb3769b7b05452ac267725086eb Mon Sep 17 00:00:00 2001
From: Jose <jose@zeroc.com>
Date: Mon, 13 Apr 2015 14:58:28 +0200
Subject: Add --depend-file/--depend-xml optinos to all Slice compilers

---
 cpp/src/Slice/Preprocessor.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'cpp/src/Slice/Preprocessor.cpp')

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;
 }
 
-- 
cgit v1.2.3