diff options
| author | Michi Henning <michi@zeroc.com> | 2009-01-28 06:55:36 +1000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2009-01-28 06:55:36 +1000 |
| commit | 09b4a1830989b33d06e7a421dbf197d2aa335b91 (patch) | |
| tree | 61a84913028a1d08a3dfa83f5b519ccda3fd1e9b /cpp/include/Slice/Preprocessor.h | |
| parent | http://bugzilla/bugzilla/show_bug.cgi?id=3483 - Move Freeze to separate Jar file (diff) | |
| parent | Squashed commit of the following: (diff) | |
| download | ice-09b4a1830989b33d06e7a421dbf197d2aa335b91.tar.bz2 ice-09b4a1830989b33d06e7a421dbf197d2aa335b91.tar.xz ice-09b4a1830989b33d06e7a421dbf197d2aa335b91.zip | |
Merge branch 'R3_3_branch'
Diffstat (limited to 'cpp/include/Slice/Preprocessor.h')
| -rw-r--r-- | cpp/include/Slice/Preprocessor.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cpp/include/Slice/Preprocessor.h b/cpp/include/Slice/Preprocessor.h index f6f5ede2e5d..54535e28812 100644 --- a/cpp/include/Slice/Preprocessor.h +++ b/cpp/include/Slice/Preprocessor.h @@ -32,7 +32,7 @@ class SLICE_API Preprocessor { public: - Preprocessor(const std::string&, const std::string&, const std::vector<std::string>&); + Preprocessor(const std::string&, const std::string&, const std::vector<std::string>&, const std::string& = "cpp"); ~Preprocessor(); FILE* preprocess(bool); @@ -40,7 +40,7 @@ public: enum Language { CPlusPlus, Java, CSharp, VisualBasic }; - void printMakefileDependencies(Language, const std::vector<std::string>&); + bool printMakefileDependencies(Language, const std::vector<std::string>&); std::string getBaseName(); @@ -54,6 +54,7 @@ private: const std::string _path; const std::string _fileName; const std::vector<std::string> _args; + const std::string _cppSourceExt; #ifdef _WIN32 std::wstring _cppFile; #else |