diff options
| author | Jose <jose@zeroc.com> | 2013-07-17 17:57:56 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2013-07-17 17:57:56 +0200 |
| commit | da37321a0d8b21df897e5af64b8c03194987f061 (patch) | |
| tree | 101b7a1cc7300cc8162c4a60a867677d97875ef1 /cpp/src/Slice/Preprocessor.cpp | |
| parent | Fixed ICE-5375 - Consider to add ICE_TRANSLATOR preprocessor macro (diff) | |
| download | ice-da37321a0d8b21df897e5af64b8c03194987f061.tar.bz2 ice-da37321a0d8b21df897e5af64b8c03194987f061.tar.xz ice-da37321a0d8b21df897e5af64b8c03194987f061.zip | |
Simplification for Slice predefined macros
Diffstat (limited to 'cpp/src/Slice/Preprocessor.cpp')
| -rw-r--r-- | cpp/src/Slice/Preprocessor.cpp | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/cpp/src/Slice/Preprocessor.cpp b/cpp/src/Slice/Preprocessor.cpp index 352cdf4147a..348f88ca841 100644 --- a/cpp/src/Slice/Preprocessor.cpp +++ b/cpp/src/Slice/Preprocessor.cpp @@ -151,19 +151,6 @@ baseArgs(vector<string> args, bool keepComments, const string& extraArgs, const ostringstream version; version << "-DICE_VERSION=" << ICE_INT_VERSION; args.push_back(version.str()); - - args.push_back("-DICE_SLICE2CPP=1"); - args.push_back("-DICE_SLICE2CS=2"); - args.push_back("-DICE_SLICE2FREEZE=3"); - args.push_back("-DICE_SLICE2FREEZEJ=4"); - args.push_back("-DICE_SLICE2HTML=5"); - args.push_back("-DICE_SLICE2JAVA=6"); - args.push_back("-DICE_SLICE2PHP=7"); - args.push_back("-DICE_SLICE2PY=8"); - args.push_back("-DICE_SLICE2RB=9"); - args.push_back("-DICE_TRANSFORMDB=10"); - args.push_back("-DICE_DUMPDB=11"); - if(!extraArgs.empty()) { args.push_back(extraArgs); @@ -301,8 +288,10 @@ Slice::Preprocessor::printMakefileDependencies(Language lang, const vector<strin // // Build arguments list. // - vector<string> args = baseArgs(_args, false, extraArgs, _fileName); - + vector<string> args = _args; + args.push_back("-M"); + args = baseArgs(args, false, extraArgs, _fileName); + const char** argv = new const char*[args.size() + 1]; for(unsigned int i = 0; i < args.size(); ++i) { |