diff options
author | Mark Spruiell <mes@zeroc.com> | 2009-02-16 12:44:02 -0800 |
---|---|---|
committer | Mark Spruiell <mes@zeroc.com> | 2009-02-16 12:44:02 -0800 |
commit | 7850a1273f217874f9a2ce1c195aed5205ce43e6 (patch) | |
tree | d5c99dccfeb91ed218674f82e6dfd2431ed6b31a /cpp/src/Slice/Preprocessor.cpp | |
parent | Bug 3715 filterMcppWarnings fix filtered strings. (diff) | |
download | ice-7850a1273f217874f9a2ce1c195aed5205ce43e6.tar.bz2 ice-7850a1273f217874f9a2ce1c195aed5205ce43e6.tar.xz ice-7850a1273f217874f9a2ce1c195aed5205ce43e6.zip |
bug 3731 - backward incompatibilities in Slice library
Diffstat (limited to 'cpp/src/Slice/Preprocessor.cpp')
-rw-r--r-- | cpp/src/Slice/Preprocessor.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/Slice/Preprocessor.cpp b/cpp/src/Slice/Preprocessor.cpp index 95432a9cee7..29c968f9f93 100644 --- a/cpp/src/Slice/Preprocessor.cpp +++ b/cpp/src/Slice/Preprocessor.cpp @@ -44,11 +44,10 @@ 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, const string& cppSourceExt) : +Slice::Preprocessor::Preprocessor(const string& path, const string& fileName, const vector<string>& args) : _path(path), _fileName(fileName), _args(args), - _cppSourceExt(cppSourceExt), _cppHandle(0) { } @@ -223,7 +222,8 @@ Slice::Preprocessor::preprocess(bool keepComments) } bool -Slice::Preprocessor::printMakefileDependencies(Language lang, const vector<string>& includePaths) +Slice::Preprocessor::printMakefileDependencies(Language lang, const vector<string>& includePaths, + const string& cppSourceExt) { if(!checkInputFile()) { @@ -426,7 +426,7 @@ Slice::Preprocessor::printMakefileDependencies(Language lang, const vector<strin string::size_type pos; while((pos = result.find(suffix)) != string::npos) { - result.replace(pos, suffix.size() - 1, "." + _cppSourceExt); + result.replace(pos, suffix.size() - 1, "." + cppSourceExt); } break; } |