diff options
| author | Bernard Normier <bernard@zeroc.com> | 2006-10-30 15:52:27 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2006-10-30 15:52:27 +0000 |
| commit | 1031cda987548b04cbc5487d94f759a86460d092 (patch) | |
| tree | 130eeeb8f28df4820e79bdd232c2c0c74e557b1f /cpp/src/slice2java/Gen.cpp | |
| parent | Removed depend target (diff) | |
| download | ice-1031cda987548b04cbc5487d94f759a86460d092.tar.bz2 ice-1031cda987548b04cbc5487d94f759a86460d092.tar.xz ice-1031cda987548b04cbc5487d94f759a86460d092.zip | |
Improved context-related code generation
Diffstat (limited to 'cpp/src/slice2java/Gen.cpp')
| -rw-r--r-- | cpp/src/slice2java/Gen.cpp | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp index 61204ed45ae..698f0399f19 100644 --- a/cpp/src/slice2java/Gen.cpp +++ b/cpp/src/slice2java/Gen.cpp @@ -3311,7 +3311,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p) { out << "return "; } - out << opName << spar << args << "null, false" << epar << ';'; + out << opName << spar << args << "null" << "false" << epar << ';'; out << eb; out << sp; @@ -3323,7 +3323,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p) { out << "return "; } - out << opName << spar << args << "__ctx, true" << epar << ';'; + out << opName << spar << args << "__ctx" << "true" << epar << ';'; out << eb; out << sp; @@ -3398,14 +3398,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p) out << sp; out << nl << "public void" << nl << op->name() << "_async" << spar << paramsAMI << epar; out << sb; - out << nl << op->name() << "_async" << spar << argsAMI << "null, false" << epar << ';'; - out << eb; - - out << sp; - out << nl << "public void" << nl << op->name() << "_async" << spar << paramsAMI - << contextParam << epar; - out << sb; - out << nl << op->name() << "_async" << spar << argsAMI << "__ctx, true" << epar << ';'; + out << nl << "__cb.__invoke" << spar << "this" << argsAMI << "null" << epar << ';'; out << eb; out << sp; @@ -3420,10 +3413,10 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p) { out << nl << "@SuppressWarnings(\"unchecked\")"; } - out << nl << "private void" << nl << op->name() << "_async" << spar << paramsAMI - << contextParam << explicitContextParam << epar; + out << nl << "public void" << nl << op->name() << "_async" << spar << paramsAMI + << contextParam << epar; out << sb; - out << nl << "if(__explicitCtx && __ctx == null)"; + out << nl << "if( __ctx == null)"; out << sb; out << nl << "__ctx = _emptyContext;"; out << eb; |