diff options
| author | Jose <jose@zeroc.com> | 2014-09-11 17:38:07 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-09-11 17:38:07 +0200 |
| commit | c23959aa7a6bb1f81f1834fd68aed48962fd6e2e (patch) | |
| tree | a1d14ec52574508a3e9e3492462c3a845e0912e7 /cpp/include/Slice/Preprocessor.h | |
| parent | Fix dependencies causing C++ rebuilds (diff) | |
| download | ice-c23959aa7a6bb1f81f1834fd68aed48962fd6e2e.tar.bz2 ice-c23959aa7a6bb1f81f1834fd68aed48962fd6e2e.tar.xz ice-c23959aa7a6bb1f81f1834fd68aed48962fd6e2e.zip | |
Revert "Fixed (ICE-3792) - dependencies in the repository are very crappy"
This reverts commit 201d395c7186e50d195672db7b472989783826cb.
Conflicts:
cpp/config/Make.rules
cpp/test/Ice/Makefile.mak
Diffstat (limited to 'cpp/include/Slice/Preprocessor.h')
| -rw-r--r-- | cpp/include/Slice/Preprocessor.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/include/Slice/Preprocessor.h b/cpp/include/Slice/Preprocessor.h index d77d4d0ea14..8a8faea76dc 100644 --- a/cpp/include/Slice/Preprocessor.h +++ b/cpp/include/Slice/Preprocessor.h @@ -41,8 +41,8 @@ public: enum Language { CPlusPlus, Java, JavaXML, CSharp, Python, Ruby, PHP, JS }; - bool printMakefileDependencies(Language, const std::string&, const std::vector<std::string>&, - const std::string& = "", const std::string& = "cpp", const std::string& = ""); + bool printMakefileDependencies(Language, const std::vector<std::string>&, const std::string& = "", const std::string& = "cpp", + const std::string& = ""); std::string getBaseName(); |