diff options
| author | Jose <jose@zeroc.com> | 2014-05-01 18:28:00 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-05-01 18:28:00 +0200 |
| commit | ce12f1b7545c677f11ec14923d976689f96d0a75 (patch) | |
| tree | ca2a4fad49b4f2b24f6706a976db8cd8c1c2394c | |
| parent | Amazon Linux RPM fixes (diff) | |
| download | ice-ce12f1b7545c677f11ec14923d976689f96d0a75.tar.bz2 ice-ce12f1b7545c677f11ec14923d976689f96d0a75.tar.xz ice-ce12f1b7545c677f11ec14923d976689f96d0a75.zip | |
Fixed (ICE-5529) - Fix slice2freeze, slice2freezej and slice2html predefined macros
| -rw-r--r-- | cpp/src/FreezeScript/DumpDB.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/slice2freeze/Main.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/slice2freezej/Main.cpp | 4 | ||||
| -rw-r--r-- | cpp/src/slice2html/Main.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/FreezeScript/DumpDB.cpp b/cpp/src/FreezeScript/DumpDB.cpp index 201ecb71dba..9acc5846da4 100644 --- a/cpp/src/FreezeScript/DumpDB.cpp +++ b/cpp/src/FreezeScript/DumpDB.cpp @@ -343,7 +343,7 @@ run(const Ice::StringSeq& originalArgs, const Ice::CommunicatorPtr& communicator Slice::UnitPtr unit = Slice::Unit::createUnit(true, true, ice, underscore); FreezeScript::Destroyer<Slice::UnitPtr> unitD(unit); - if(!FreezeScript::parseSlice(appName, unit, slice, cppArgs, debug, "-D___DUMPDB__")) + if(!FreezeScript::parseSlice(appName, unit, slice, cppArgs, debug, "-D__DUMPDB__")) { return EXIT_FAILURE; } diff --git a/cpp/src/slice2freeze/Main.cpp b/cpp/src/slice2freeze/Main.cpp index a184913d187..88c229fb52c 100644 --- a/cpp/src/slice2freeze/Main.cpp +++ b/cpp/src/slice2freeze/Main.cpp @@ -1952,7 +1952,7 @@ compile(int argc, char* argv[]) // includes.push_back(icecpp->getBaseName() + ".h"); - FILE* cppHandle = icecpp->preprocess(false, "-DICE_COMPILER=ICE_SLICE2FREEZE"); + FILE* cppHandle = icecpp->preprocess(false, "-D__SLICE2FREEZE__"); if(cppHandle == 0) { diff --git a/cpp/src/slice2freezej/Main.cpp b/cpp/src/slice2freezej/Main.cpp index 6a1b045b033..07f2d0eecee 100644 --- a/cpp/src/slice2freezej/Main.cpp +++ b/cpp/src/slice2freezej/Main.cpp @@ -1771,7 +1771,7 @@ compile(int argc, char* argv[]) if(depend || dependxml) { PreprocessorPtr icecpp = Preprocessor::create(argv[0], args[idx], cppArgs); - FILE* cppHandle = icecpp->preprocess(false, "-DICE_COMPILER=ICE_SLICE2FREEZEJ"); + FILE* cppHandle = icecpp->preprocess(false, "-D__SLICE2FREEZEJ__"); if(cppHandle == 0) { @@ -1788,7 +1788,7 @@ compile(int argc, char* argv[]) } if(!icecpp->printMakefileDependencies(depend ? Preprocessor::Java : Preprocessor::JavaXML, includePaths, - "-DICE_COMPILER=ICE_SLICE2FREEZEJ")) + "-D__SLICE2FREEZEJ__")) { u->destroy(); return EXIT_FAILURE; diff --git a/cpp/src/slice2html/Main.cpp b/cpp/src/slice2html/Main.cpp index d236e388789..a2908f593ca 100644 --- a/cpp/src/slice2html/Main.cpp +++ b/cpp/src/slice2html/Main.cpp @@ -222,7 +222,7 @@ compile(int argc, char* argv[]) for(vector<string>::size_type idx = 0; idx < args.size(); ++idx) { PreprocessorPtr icecpp = Preprocessor::create(argv[0], args[idx], cppArgs); - FILE* cppHandle = icecpp->preprocess(true, "-DICE_COMPILER=ICE_SLICE2HTML"); + FILE* cppHandle = icecpp->preprocess(true, "-D__SLICE2HTML__"); if(cppHandle == 0) { |