diff options
Diffstat (limited to 'cpp/src/slice2cpp')
| -rw-r--r-- | cpp/src/slice2cpp/.depend | 2 | ||||
| -rw-r--r-- | cpp/src/slice2cpp/Gen.cpp | 1 | ||||
| -rw-r--r-- | cpp/src/slice2cpp/Main.cpp | 18 |
3 files changed, 10 insertions, 11 deletions
diff --git a/cpp/src/slice2cpp/.depend b/cpp/src/slice2cpp/.depend index 932480d0af9..636e1d492af 100644 --- a/cpp/src/slice2cpp/.depend +++ b/cpp/src/slice2cpp/.depend @@ -1,2 +1,2 @@ -Gen$(OBJEXT): Gen.cpp $(includedir)/IceUtil/DisableWarnings.h Gen.h $(includedir)/Slice/Parser.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/OutputUtil.h $(includedir)/Slice/Util.h $(includedir)/Slice/CPlusPlusUtil.h $(includedir)/IceUtil/Functional.h $(includedir)/IceUtil/Iterator.h $(includedir)/Slice/Checksum.h $(includedir)/Slice/FileTracker.h $(includedir)/Slice/Preprocessor.h +Gen$(OBJEXT): Gen.cpp $(includedir)/IceUtil/DisableWarnings.h Gen.h $(includedir)/Slice/Parser.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/OutputUtil.h $(includedir)/Slice/Util.h $(includedir)/Slice/CPlusPlusUtil.h $(includedir)/IceUtil/Functional.h $(includedir)/IceUtil/Iterator.h $(includedir)/Slice/Checksum.h $(includedir)/Slice/FileTracker.h Main$(OBJEXT): Main.cpp $(includedir)/IceUtil/Options.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/RecMutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/IceUtil/MutexProtocol.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/CtrlCHandler.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/MutexPtrLock.h $(includedir)/Slice/Preprocessor.h $(includedir)/Slice/FileTracker.h $(includedir)/Slice/Parser.h $(includedir)/Slice/Util.h Gen.h $(includedir)/IceUtil/OutputUtil.h diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index 0eff3cf3e09..926abaaffab 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -15,7 +15,6 @@ #include <IceUtil/Iterator.h> #include <Slice/Checksum.h> #include <Slice/FileTracker.h> -#include <Slice/Preprocessor.h> #include <limits> diff --git a/cpp/src/slice2cpp/Main.cpp b/cpp/src/slice2cpp/Main.cpp index 9e75afaf7c2..903b5f05f7d 100644 --- a/cpp/src/slice2cpp/Main.cpp +++ b/cpp/src/slice2cpp/Main.cpp @@ -193,8 +193,8 @@ compile(int argc, char* argv[]) { if(depend) { - 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) { @@ -210,20 +210,20 @@ compile(int argc, char* argv[]) return EXIT_FAILURE; } - if(!icecpp.printMakefileDependencies(Preprocessor::CPlusPlus, includePaths, sourceExtension)) + if(!icecpp->printMakefileDependencies(Preprocessor::CPlusPlus, includePaths, sourceExtension)) { return EXIT_FAILURE; } - if(!icecpp.close()) + if(!icecpp->close()) { return EXIT_FAILURE; } } else { - 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) { @@ -240,7 +240,7 @@ compile(int argc, char* argv[]) return EXIT_FAILURE; } } - if(!icecpp.close()) + if(!icecpp->close()) { return EXIT_FAILURE; } @@ -250,7 +250,7 @@ compile(int argc, char* argv[]) UnitPtr u = Unit::createUnit(false, false, ice); int parseStatus = u->parse(*i, cppHandle, debug); - if(!icecpp.close()) + if(!icecpp->close()) { u->destroy(); return EXIT_FAILURE; @@ -264,7 +264,7 @@ compile(int argc, char* argv[]) { try { - Gen gen(icecpp.getBaseName(), headerExtension, sourceExtension, extraHeaders, include, + Gen gen(icecpp->getBaseName(), headerExtension, sourceExtension, extraHeaders, include, includePaths, dllExport, output, impl, checksum, stream, ice); gen.generate(u); } |