diff options
| author | Bernard Normier <bernard@zeroc.com> | 2017-04-07 21:41:04 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2017-04-07 21:41:04 -0400 |
| commit | 5e58618ca24587f57d9b502b7342c8a7968261f3 (patch) | |
| tree | 27de2449fe2d982434db0f8d69b30f118c4f5ff5 /cpp/test/Ice/invoke/BlobjectI.cpp | |
| parent | Minor fix to JS controller and PHP timeout test (bumped hold time) (diff) | |
| download | ice-5e58618ca24587f57d9b502b7342c8a7968261f3.tar.bz2 ice-5e58618ca24587f57d9b502b7342c8a7968261f3.tar.xz ice-5e58618ca24587f57d9b502b7342c8a7968261f3.zip | |
ICE-7768: fixed C++11 Blobject API
Diffstat (limited to 'cpp/test/Ice/invoke/BlobjectI.cpp')
| -rw-r--r-- | cpp/test/Ice/invoke/BlobjectI.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/test/Ice/invoke/BlobjectI.cpp b/cpp/test/Ice/invoke/BlobjectI.cpp index 2f65a4f3621..cfe6fd9ddee 100644 --- a/cpp/test/Ice/invoke/BlobjectI.cpp +++ b/cpp/test/Ice/invoke/BlobjectI.cpp @@ -84,14 +84,14 @@ invokeInternal(Ice::InputStream& in, vector<Ice::Byte>& outEncaps, const Ice::Cu } bool -BlobjectI::ice_invoke(const vector<Ice::Byte>& inEncaps, vector<Ice::Byte>& outEncaps, const Ice::Current& current) +BlobjectI::ice_invoke(ICE_IN(vector<Ice::Byte>) inEncaps, vector<Ice::Byte>& outEncaps, const Ice::Current& current) { Ice::InputStream in(current.adapter->getCommunicator(), current.encoding, inEncaps); return invokeInternal(in, outEncaps, current); } bool -BlobjectArrayI::ice_invoke(const pair<const Ice::Byte*, const Ice::Byte*>& inEncaps, vector<Ice::Byte>& outEncaps, +BlobjectArrayI::ice_invoke(ICE_IN(pair<const Ice::Byte*, const Ice::Byte*>) inEncaps, vector<Ice::Byte>& outEncaps, const Ice::Current& current) { Ice::InputStream in(current.adapter->getCommunicator(), current.encoding, inEncaps); @@ -101,19 +101,19 @@ BlobjectArrayI::ice_invoke(const pair<const Ice::Byte*, const Ice::Byte*>& inEnc #ifdef ICE_CPP11_MAPPING void BlobjectAsyncI::ice_invokeAsync(vector<Ice::Byte> inEncaps, - function<void(bool, vector<Ice::Byte>)> response, + function<void(bool, const vector<Ice::Byte>&)> response, function<void(exception_ptr)>, const Ice::Current& current) { Ice::InputStream in(current.adapter->getCommunicator(), inEncaps); vector<Ice::Byte> outEncaps; bool ok = invokeInternal(in, outEncaps, current); - response(ok, move(outEncaps)); + response(ok, outEncaps); } void BlobjectArrayAsyncI::ice_invokeAsync(pair<const Ice::Byte*, const Ice::Byte*> inEncaps, - function<void(bool, pair<const Ice::Byte*, const Ice::Byte*>)> response, + function<void(bool, const pair<const Ice::Byte*, const Ice::Byte*>&)> response, function<void(exception_ptr)>, const Ice::Current& current) { @@ -130,7 +130,7 @@ BlobjectArrayAsyncI::ice_invokeAsync(pair<const Ice::Byte*, const Ice::Byte*> in outPair.first = &outEncaps[0]; outPair.second = &outEncaps[0] + outEncaps.size(); } - response(ok, move(outPair)); + response(ok, outPair); } #else void |