diff options
author | Jose <jose@zeroc.com> | 2015-12-07 21:08:51 +0100 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2015-12-07 21:08:51 +0100 |
commit | acb6c5333de462e29d21166057fc074a815f2e3d (patch) | |
tree | 9acad37c34ef7b503f3aac13ea1858f1c965946c /cpp/src/Ice/BasicStream.cpp | |
parent | ICE-6897 - Add delegate metadata (diff) | |
download | ice-acb6c5333de462e29d21166057fc074a815f2e3d.tar.bz2 ice-acb6c5333de462e29d21166057fc074a815f2e3d.tar.xz ice-acb6c5333de462e29d21166057fc074a815f2e3d.zip |
C++11 mapping updates:
- Added missing __hash method
- Added missing virtual method Value::ice_clone
- Fixed issue with unmarshalling the idirection table
- Fixed default value initialization for scoped enums
- Fixed scoped enums mapping to use correct size types
- Added missing ice_id method to generated Value classes
- Fixed defaultValue, hash, networkProxy, plug-in,
stringConverter, threadPoolPriority and slicing/objects
tests to work with C++11 mapping
Diffstat (limited to 'cpp/src/Ice/BasicStream.cpp')
-rw-r--r-- | cpp/src/Ice/BasicStream.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/BasicStream.cpp index 3bd7751a1e7..d60a31abc54 100644 --- a/cpp/src/Ice/BasicStream.cpp +++ b/cpp/src/Ice/BasicStream.cpp @@ -2946,7 +2946,11 @@ IceInternal::BasicStream::EncapsDecoder11::readSlicedData() IndexList::size_type j = 0; for(IndexList::const_iterator p = table.begin(); p != table.end(); ++p) { +#ifdef ICE_CPP11_MAPPING + addPatchEntry(*p, &patchHandle<Value>, &objects[j++]); +#else addPatchEntry(*p, &patchHandle<Object>, &objects[j++]); +#endif } } return ICE_MAKE_SHARED(SlicedData, _current->slices); |