summaryrefslogtreecommitdiff
path: root/cpp/src/slice2cs/Main.cpp
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2009-09-04 16:22:16 -0700
committerMark Spruiell <mes@zeroc.com>2009-09-04 16:22:16 -0700
commit6eecee0c43e73da2d52929155c3ada9b32081dce (patch)
tree18f12e3d1937073976eb10746221f9ae5d4731fb /cpp/src/slice2cs/Main.cpp
parentbug 4196 - add class loader to InitializationData (diff)
downloadice-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/slice2cs/Main.cpp')
-rw-r--r--cpp/src/slice2cs/Main.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/cpp/src/slice2cs/Main.cpp b/cpp/src/slice2cs/Main.cpp
index 773242e30b2..aa596978034 100644
--- a/cpp/src/slice2cs/Main.cpp
+++ b/cpp/src/slice2cs/Main.cpp
@@ -188,8 +188,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)
{
@@ -205,20 +205,20 @@ compile(int argc, char* argv[])
return EXIT_FAILURE;
}
- if(!icecpp.printMakefileDependencies(Preprocessor::CSharp, includePaths))
+ if(!icecpp->printMakefileDependencies(Preprocessor::CSharp, includePaths))
{
return EXIT_FAILURE;
}
- if(!icecpp.close())
+ if(!icecpp->close())
{
return EXIT_FAILURE;
}
}
else
{
- 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)
{
@@ -234,7 +234,7 @@ compile(int argc, char* argv[])
return EXIT_FAILURE;
}
}
- if(!icecpp.close())
+ if(!icecpp->close())
{
return EXIT_FAILURE;
}
@@ -244,7 +244,7 @@ compile(int argc, char* argv[])
UnitPtr p = Unit::createUnit(false, false, ice);
int parseStatus = p->parse(*i, cppHandle, debug);
- if(!icecpp.close())
+ if(!icecpp->close())
{
p->destroy();
return EXIT_FAILURE;
@@ -258,7 +258,7 @@ compile(int argc, char* argv[])
{
try
{
- Gen gen(icecpp.getBaseName(), includePaths, output, impl, implTie, stream);
+ Gen gen(icecpp->getBaseName(), includePaths, output, impl, implTie, stream);
gen.generate(p);
if(tie)
{