diff options
| author | Brent Eagles <brent@zeroc.com> | 2005-09-02 16:42:58 +0000 |
|---|---|---|
| committer | Brent Eagles <brent@zeroc.com> | 2005-09-02 16:42:58 +0000 |
| commit | 9716a470f487e4d400f2d7c320127783187c54da (patch) | |
| tree | 1bed72beac14cf0d76909797a52925ecbdfc1137 /cpp/src/slice2cpp/Gen.cpp | |
| parent | Fix potential NPE (diff) | |
| download | ice-9716a470f487e4d400f2d7c320127783187c54da.tar.bz2 ice-9716a470f487e4d400f2d7c320127783187c54da.tar.xz ice-9716a470f487e4d400f2d7c320127783187c54da.zip | |
fixes for bug 422
Diffstat (limited to 'cpp/src/slice2cpp/Gen.cpp')
| -rw-r--r-- | cpp/src/slice2cpp/Gen.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index f5c8c3542a1..9d9d7d4ee4b 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -1884,7 +1884,7 @@ Slice::Gen::DelegateMVisitor::visitOperation(const OperationPtr& p) C << sp << nl << retS << nl << "IceDelegateM" << scoped << spar << paramsDecl << epar; C << sb; C << nl << "::IceInternal::Outgoing __og(__connection.get(), __reference.get(), " << flatName << ", " - << "static_cast< ::Ice::OperationMode>(" << p->mode() << "), __context, __compress);"; + << operationModeToString(p->mode()) << ", __context, __compress);"; if(!inParams.empty()) { C << nl << "try"; @@ -2131,7 +2131,7 @@ Slice::Gen::DelegateDVisitor::visitOperation(const OperationPtr& p) C << sb; C << nl << "::Ice::Current __current;"; C << nl << "__initCurrent(__current, \"" << p->name() - << "\", static_cast< ::Ice::OperationMode>(" << p->mode() << "), __context);"; + << "\", " << operationModeToString(p->mode()) << ", __context);"; C << nl << "while(true)"; C << sb; C << nl << "::IceInternal::Direct __direct(__current);"; @@ -4116,8 +4116,7 @@ Slice::Gen::AsyncVisitor::visitOperation(const OperationPtr& p) C << nl << "try"; C << sb; C << nl << "static const ::std::string __operation(\"" << name << "\");"; - C << nl << "__prepare(__prx, " << flatName << ", static_cast< ::Ice::OperationMode>(" << p->mode() - << "), __ctx);"; + C << nl << "__prepare(__prx, " << flatName << ", " << operationModeToString(p->mode()) << ", __ctx);"; writeMarshalCode(C, inParams, 0); if(p->sendsClasses()) { |