diff options
| author | Jose <jose@zeroc.com> | 2015-12-15 18:35:14 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2015-12-15 18:35:14 +0100 |
| commit | de0939c485861ad124f64e213883c74571eefa2b (patch) | |
| tree | c6dc163ddcee5aa0d878eb2463b57fc6a32a5f47 /cpp/src/Ice/BasicStream.cpp | |
| parent | Removed iOS workaround from udp test (diff) | |
| download | ice-de0939c485861ad124f64e213883c74571eefa2b.tar.bz2 ice-de0939c485861ad124f64e213883c74571eefa2b.tar.xz ice-de0939c485861ad124f64e213883c74571eefa2b.zip | |
C++11 mapping: fixes to InitializationData
Diffstat (limited to 'cpp/src/Ice/BasicStream.cpp')
| -rw-r--r-- | cpp/src/Ice/BasicStream.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/BasicStream.cpp index 7dabb6cd7e4..4e3de10edc8 100644 --- a/cpp/src/Ice/BasicStream.cpp +++ b/cpp/src/Ice/BasicStream.cpp @@ -2805,7 +2805,11 @@ IceInternal::BasicStream::EncapsDecoder11::readInstance(Int index, PatchFunc pat startSlice(); const string mostDerivedId = _current->typeId; Ice::ValuePtr v; +#ifdef ICE_CPP11_MAPPING + function<string (int)> compactIdResolver = _stream->instance()->initializationData().compactIdResolver; +#else const CompactIdResolverPtr& compactIdResolver = _stream->instance()->initializationData().compactIdResolver; +#endif while(true) { if(_current->compactId >= 0) @@ -2818,7 +2822,11 @@ IceInternal::BasicStream::EncapsDecoder11::readInstance(Int index, PatchFunc pat { try { +#ifdef ICE_CPP11_MAPPING + _current->typeId = compactIdResolver(_current->compactId); +#else _current->typeId = compactIdResolver->resolve(_current->compactId); +#endif } catch(const LocalException&) { |