diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-06-01 09:26:44 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-06-01 09:26:44 +0200 |
| commit | 19077d22e78f93212445c6969045e736b4a466d7 (patch) | |
| tree | 484d4b0dc9a791c9f8f0c4b3dbf212856aba1f55 /cpp/src/slice2cpp | |
| parent | Updated recursive mutex check (diff) | |
| download | ice-19077d22e78f93212445c6969045e736b4a466d7.tar.bz2 ice-19077d22e78f93212445c6969045e736b4a466d7.tar.xz ice-19077d22e78f93212445c6969045e736b4a466d7.zip | |
Fixed ICE-7941 - scheduleCallback now provides the connection to the dispatcher work item, fixed naming of AsyncResult private methods
Diffstat (limited to 'cpp/src/slice2cpp')
| -rw-r--r-- | cpp/src/slice2cpp/Gen.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index e096ae39e1e..6b4e25ecba6 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -2055,7 +2055,7 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p) C << sb; if(p->returnsData()) { - C << nl << "::Ice::AsyncResult::check(result, this, " << flatName << ");"; + C << nl << "::Ice::AsyncResult::_check(result, this, " << flatName << ");"; // // COMPILERFIX: It's necessary to generate the allocate code here before @@ -2064,11 +2064,11 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p) // and Windows 64 bits when compiled with optimization (see bug 4400). // writeAllocateCode(C, ParamDeclList(), p, true, _useWstring | TypeContextAMIEnd); - C << nl << "if(!result->waitForResponse())"; + C << nl << "if(!result->_waitForResponse())"; C << sb; C << nl << "try"; C << sb; - C << nl << "result->throwUserException();"; + C << nl << "result->_throwUserException();"; C << eb; // // Generate a catch block for each legal user exception. @@ -2096,17 +2096,17 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p) C << eb; if(ret || !outParams.empty()) { - C << nl << "::Ice::InputStream* istr = result->startReadParams();"; + C << nl << "::Ice::InputStream* istr = result->_startReadParams();"; writeUnmarshalCode(C, outParams, p, true, _useWstring | TypeContextAMIEnd); if(p->returnsClasses(false)) { C << nl << "istr->readPendingValues();"; } - C << nl << "result->endReadParams();"; + C << nl << "result->_endReadParams();"; } else { - C << nl << "result->readEmptyParams();"; + C << nl << "result->_readEmptyParams();"; } if(ret) { @@ -2126,12 +2126,12 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p) C << sp << nl << "void IceProxy" << scope << "_iceI_end_" << name << spar << outParamsDeclEndAMI << "const ::Ice::AsyncResultPtr& result" << epar; C << sb; - C << nl << "::Ice::AsyncResult::check(result, this, " << flatName << ");"; - C << nl << "if(!result->waitForResponse())"; + C << nl << "::Ice::AsyncResult::_check(result, this, " << flatName << ");"; + C << nl << "if(!result->_waitForResponse())"; C << sb; C << nl << "try"; C << sb; - C << nl << "result->throwUserException();"; + C << nl << "result->_throwUserException();"; C << eb; // // Generate a catch block for each legal user exception. @@ -2160,17 +2160,17 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p) if(ret || !outParams.empty()) { - C << nl << "::Ice::InputStream* istr = result->startReadParams();"; + C << nl << "::Ice::InputStream* istr = result->_startReadParams();"; writeUnmarshalCode(C, outParams, p, true, _useWstring | TypeContextAMIPrivateEnd); if(p->returnsClasses(false)) { C << nl << "istr->readPendingValues();"; } - C << nl << "result->endReadParams();"; + C << nl << "result->_endReadParams();"; } else { - C << nl << "result->readEmptyParams();"; + C << nl << "result->_readEmptyParams();"; } C << eb; } |