diff options
| author | Joe George <joe@zeroc.com> | 2016-06-08 15:30:30 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2016-06-08 15:30:30 -0400 |
| commit | e5a8741b6af4bff17d3db4a3f37c26c4f21194c4 (patch) | |
| tree | dfeb2fb83d200b8a411cd65b7de3db928a418ce4 /cpp/src/Ice/Object.cpp | |
| parent | Replaced some ScopeArrays by vector or wstring (diff) | |
| download | ice-e5a8741b6af4bff17d3db4a3f37c26c4f21194c4.tar.bz2 ice-e5a8741b6af4bff17d3db4a3f37c26c4f21194c4.tar.xz ice-e5a8741b6af4bff17d3db4a3f37c26c4f21194c4.zip | |
ICE-6982 and ICE-6946
- Refactord C++ class/exception stream generated code
- Changed return type of Obejct::ice_id() to std::string for C++11
Diffstat (limited to 'cpp/src/Ice/Object.cpp')
| -rw-r--r-- | cpp/src/Ice/Object.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp index 7b049322512..b4bd4597fbe 100644 --- a/cpp/src/Ice/Object.cpp +++ b/cpp/src/Ice/Object.cpp @@ -78,7 +78,11 @@ Ice::Object::ice_ids(const Current&) const return vector<string>(&__Ice__Object_ids[0], &__Ice__Object_ids[1]); } +#ifdef ICE_CPP11_MAPPING +string +#else const string& +#endif Ice::Object::ice_id(const Current&) const { return __Ice__Object_ids[0]; @@ -388,7 +392,7 @@ Ice::BlobjectAsync::__dispatch(Incoming& in, const Current& current) auto async = IncomingAsync::create(in); try { - ice_invoke_async(vector<Byte>(inEncaps, inEncaps + sz), + ice_invoke_async(vector<Byte>(inEncaps, inEncaps + sz), [async](bool ok, const vector<Byte>& outEncaps) { if(async->__validateResponse(ok)) @@ -470,7 +474,7 @@ Ice::BlobjectArrayAsync::__dispatch(Incoming& in, const Current& current) auto async = IncomingAsync::create(in); try { - ice_invoke_async(inEncaps, + ice_invoke_async(inEncaps, [async](bool ok, const pair<const Byte*, const Byte*>& outEncaps) { if(async->__validateResponse(ok)) |