diff options
| author | Mark Spruiell <mes@zeroc.com> | 2009-09-04 16:22:16 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2009-09-04 16:22:16 -0700 |
| commit | 6eecee0c43e73da2d52929155c3ada9b32081dce (patch) | |
| tree | 18f12e3d1937073976eb10746221f9ae5d4731fb /cpp/src/slice2java/Main.cpp | |
| parent | bug 4196 - add class loader to InitializationData (diff) | |
| download | ice-6eecee0c43e73da2d52929155c3ada9b32081dce.tar.bz2 ice-6eecee0c43e73da2d52929155c3ada9b32081dce.tar.xz ice-6eecee0c43e73da2d52929155c3ada9b32081dce.zip | |
bug 3737:
- Remove Python workaround for 3.3.1
- Make Slice::Preprocessor a dynamically allocated class
Diffstat (limited to 'cpp/src/slice2java/Main.cpp')
| -rw-r--r-- | cpp/src/slice2java/Main.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/cpp/src/slice2java/Main.cpp b/cpp/src/slice2java/Main.cpp index 9488e64d79c..06d41d2534f 100644 --- a/cpp/src/slice2java/Main.cpp +++ b/cpp/src/slice2java/Main.cpp @@ -212,8 +212,8 @@ compile(int argc, char* argv[]) { if(depend || dependxml) { - Preprocessor icecpp(argv[0], *i, cppArgs); - FILE* cppHandle = icecpp.preprocess(false); + PreprocessorPtr icecpp = Preprocessor::create(argv[0], *i, cppArgs); + FILE* cppHandle = icecpp->preprocess(false); if(cppHandle == 0) { @@ -229,12 +229,12 @@ compile(int argc, char* argv[]) return EXIT_FAILURE; } - if(!icecpp.printMakefileDependencies(depend ? Preprocessor::Java : Preprocessor::JavaXML, includePaths)) + if(!icecpp->printMakefileDependencies(depend ? Preprocessor::Java : Preprocessor::JavaXML, includePaths)) { return EXIT_FAILURE; } - if(!icecpp.close()) + if(!icecpp->close()) { return EXIT_FAILURE; } @@ -249,8 +249,8 @@ compile(int argc, char* argv[]) FileTracker::instance()->setSource(*i); - Preprocessor icecpp(argv[0], *i, cppArgs); - FILE* cppHandle = icecpp.preprocess(true); + PreprocessorPtr icecpp = Preprocessor::create(argv[0], *i, cppArgs); + FILE* cppHandle = icecpp->preprocess(true); if(cppHandle == 0) { @@ -272,7 +272,7 @@ compile(int argc, char* argv[]) return EXIT_FAILURE; } } - if(!icecpp.close()) + if(!icecpp->close()) { return EXIT_FAILURE; } @@ -282,7 +282,7 @@ compile(int argc, char* argv[]) UnitPtr p = Unit::createUnit(false, false, ice, globalMetadata); int parseStatus = p->parse(*i, cppHandle, debug, Ice); - if(!icecpp.close()) + if(!icecpp->close()) { p->destroy(); return EXIT_FAILURE; @@ -301,7 +301,7 @@ compile(int argc, char* argv[]) { try { - Gen gen(argv[0], icecpp.getBaseName(), includePaths, output); + Gen gen(argv[0], icecpp->getBaseName(), includePaths, output); gen.generate(p, stream); if(tie) { |