diff options
author | Benoit Foucher <benoit@zeroc.com> | 2012-06-20 10:42:48 +0200 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2012-06-20 10:42:48 +0200 |
commit | eddcd80c0a9c29bc7c807db3ccf0e1e3484ac43f (patch) | |
tree | 1e4575ae28d98639018bdd23c38a6702d162e6a2 /cpp/src/Ice/SlicedData.cpp | |
parent | * Grammar fixes (diff) | |
download | ice-eddcd80c0a9c29bc7c807db3ccf0e1e3484ac43f.tar.bz2 ice-eddcd80c0a9c29bc7c807db3ccf0e1e3484ac43f.tar.xz ice-eddcd80c0a9c29bc7c807db3ccf0e1e3484ac43f.zip |
Don't write optionals with 1.0 encoding, added UnknownSlicedObject test, fixed exception un-marhsalling to raise UnkownUserException for unknown exceptions.
Diffstat (limited to 'cpp/src/Ice/SlicedData.cpp')
-rw-r--r-- | cpp/src/Ice/SlicedData.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cpp/src/Ice/SlicedData.cpp b/cpp/src/Ice/SlicedData.cpp index 568c55a7585..9b2e88b609c 100644 --- a/cpp/src/Ice/SlicedData.cpp +++ b/cpp/src/Ice/SlicedData.cpp @@ -16,6 +16,7 @@ using namespace Ice; IceUtil::Shared* Ice::upCast(SliceInfo* p) { return p; } IceUtil::Shared* Ice::upCast(SlicedData* p) { return p; } +IceUtil::Shared* Ice::upCast(UnknownSlicedObject* p) { return p; } Ice::SlicedData::SlicedData(const SliceInfoSeq& seq) : slices(seq) |