From 55f6e6863b8f17312e8ff58d05d6d035c822187b Mon Sep 17 00:00:00 2001
From: Jose <jose@zeroc.com>
Date: Tue, 27 Jan 2009 19:28:59 +0100
Subject: Squashed commit of the following:

commit 9aa67a8862e402cb52276282b26a40422fae4adb
Author: Jose Gutierrez <jose@zeroc.com>
Date:   Tue Jan 27 19:25:22 2009 +0100

    Fixed 3374 --header-ext not work as intended.
---
 cpp/src/Slice/Preprocessor.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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

diff --git a/cpp/src/Slice/Preprocessor.cpp b/cpp/src/Slice/Preprocessor.cpp
index 6c226c2db72..636c772b94d 100644
--- a/cpp/src/Slice/Preprocessor.cpp
+++ b/cpp/src/Slice/Preprocessor.cpp
@@ -44,10 +44,11 @@ extern "C" int   mcpp_lib_main(int argc, char** argv);
 extern "C" void  mcpp_use_mem_buffers(int tf);
 extern "C" char* mcpp_get_mem_buffer(Outdest od);
 
-Slice::Preprocessor::Preprocessor(const string& path, const string& fileName, const vector<string>& args) :
+Slice::Preprocessor::Preprocessor(const string& path, const string& fileName, const vector<string>& args, const string& cppSourceExt) :
     _path(path),
     _fileName(fileName),
     _args(args),
+    _cppSourceExt(cppSourceExt),
     _cppHandle(0)
 {
 }
@@ -390,12 +391,12 @@ Slice::Preprocessor::printMakefileDependencies(Language lang, const vector<strin
         case CPlusPlus:
         {
             //
-            // Change .o[bj] suffix to .cpp suffix.
+            // Change .o[bj] suffix to the cpp source extension suffix.
             //
             string::size_type pos;
             while((pos = result.find(suffix)) != string::npos)
             {
-                result.replace(pos, suffix.size() - 1, ".cpp");
+                result.replace(pos, suffix.size() - 1, "." + _cppSourceExt);
             }
             break;
         }
-- 
cgit v1.2.3