Added Ice::UserException::ice_getSlicedData and Ice::UnkownSlicedValue::ice_id methods

7 files changed, 60 insertions, 10 deletions

diff --git a/cpp/src/Ice/Exception.cpp b/cpp/src/Ice/Exception.cpp
index 9faa0bddc71..968f9d3edbc 100644
--- a/cpp/src/Ice/Exception.cpp
+++ b/cpp/src/Ice/Exception.cpp
@@ -77,7 +77,7 @@ throwUOE(const string& expectedType, const ValuePtr& v)
     UnknownSlicedValue* usv = dynamic_cast<UnknownSlicedValue*>(v.get());
     if(usv)
     {
-        throw NoValueFactoryException(__FILE__, __LINE__, "", usv->getUnknownTypeId());
+        throw NoValueFactoryException(__FILE__, __LINE__, "", usv->ice_id());
     }
 
     string type = v->ice_id();
@@ -127,6 +127,12 @@ Ice::UserException::ice_clone() const
 }
 #endif
 
+Ice::SlicedDataPtr
+Ice::UserException::ice_getSlicedData() const
+{
+    return ICE_NULLPTR;
+}
+
 void
 Ice::UserException::_write(::Ice::OutputStream* os) const
 {
diff --git a/cpp/src/Ice/SlicedData.cpp b/cpp/src/Ice/SlicedData.cpp
index 56b10f6aba1..ced50e1211c 100644
--- a/cpp/src/Ice/SlicedData.cpp
+++ b/cpp/src/Ice/SlicedData.cpp
@@ -72,12 +72,6 @@ Ice::UnknownSlicedValue::UnknownSlicedValue(const string& unknownTypeId) : _unkn
 {
 }
 
-const string&
-Ice::UnknownSlicedValue::getUnknownTypeId() const
-{
-    return _unknownTypeId;
-}
-
 SlicedDataPtr
 Ice::UnknownSlicedValue::ice_getSlicedData() const
 {
@@ -106,6 +100,12 @@ Ice::UnknownSlicedValue::_iceCloneImpl() const
 
 #else
 
+const string&
+Ice::UnknownSlicedValue::ice_id(const Current&) const
+{
+    return _unknownTypeId;
+}
+
 void
 Ice::UnknownSlicedValue::_iceGcVisitMembers(IceInternal::GCVisitor& _v)
 {
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index f017ad66b4b..81b0ef1dcc5 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -1193,7 +1193,11 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
 
         if(preserved && !basePreserved)
         {
-            H << sp << nl << "virtual void _write(::Ice::OutputStream*) const;";
+            H << sp;
+            H << nl << "virtual ::Ice::SlicedDataPtr ice_getSlicedData() const;";
+
+            H << sp;
+            H << nl << "virtual void _write(::Ice::OutputStream*) const;";
             H << nl << "virtual void _read(::Ice::InputStream*);";
 
             string baseName = base ? fixKwd(base->scoped()) : string("::Ice::UserException");
@@ -1215,6 +1219,12 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
 
             H << sp << nl << "::Ice::SlicedDataPtr _slicedData;";
 
+            C << sp;
+            C << nl << "::Ice::SlicedDataPtr" << nl << scoped.substr(2) << "::ice_getSlicedData() const";
+            C << sb;
+            C << nl << "return _slicedData;";
+            C << eb;
+
             C << sp << nl << "void" << nl << scoped.substr(2) << "::_write(::Ice::OutputStream* ostr) const";
             C << sb;
             C << nl << "ostr->startException(_slicedData);";
@@ -5576,11 +5586,20 @@ Slice::Gen::Cpp11TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
 
         if(preserved && !basePreserved)
         {
-            H << sp << nl << _dllMemberExport << "virtual void _write(::Ice::OutputStream*) const override;";
+            H << sp;
+            H << nl << _dllMemberExport << "virtual ::std::shared_ptr<::Ice::SlicedData> ice_getSlicedData() const override;";
+            H << sp;
+            H << nl << _dllMemberExport << "virtual void _write(::Ice::OutputStream*) const override;";
             H << nl << _dllMemberExport << "virtual void _read(::Ice::InputStream*) override;";
 
             H << sp << nl << "::std::shared_ptr<::Ice::SlicedData> _slicedData;";
 
+            C << sp;
+            C << nl << "::std::shared_ptr<::Ice::SlicedData>" << nl << scoped.substr(2) << "::ice_getSlicedData() const";
+            C << sb;
+            C << nl << "return _slicedData;";
+            C << eb;
+
             C << sp << nl << "void" << nl << scoped.substr(2) << "::_write(::Ice::OutputStream* ostr) const";
             C << sb;
             C << nl << "ostr->startException(_slicedData);";
diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp
index 1d8f88797e3..b70aae7be01 100644
--- a/cpp/src/slice2cs/Gen.cpp
+++ b/cpp/src/slice2cs/Gen.cpp
@@ -2797,6 +2797,13 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
         {
             _out << sp;
             emitGeneratedCodeAttribute();
+            _out << nl << "public override Ice.SlicedData ice_getSlicedData()";
+            _out << sb;
+            _out << nl << "return slicedData_;";
+            _out << eb;
+
+            _out << sp;
+            emitGeneratedCodeAttribute();
             _out << nl << "public override void iceWrite(Ice.OutputStream ostr_)";
             _out << sb;
             _out << nl << "ostr_.startException(slicedData_);";
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp
index 15b2a939e23..e6a225a11a6 100644
--- a/cpp/src/slice2java/Gen.cpp
+++ b/cpp/src/slice2java/Gen.cpp
@@ -3136,6 +3136,13 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
         {
             out << sp;
             out << nl << "@Override";
+            out << nl << "public com.zeroc.Ice.SlicedData ice_getSlicedData()";
+            out << sb;
+            out << nl << "return _slicedData;";
+            out << eb;
+
+            out << sp;
+            out << nl << "@Override";
             out << nl << "public void _write(com.zeroc.Ice.OutputStream ostr)";
             out << sb;
             out << nl << "ostr.startException(_slicedData);";
diff --git a/cpp/src/slice2java/GenCompat.cpp b/cpp/src/slice2java/GenCompat.cpp
index 14279536038..e09db4c6c3b 100644
--- a/cpp/src/slice2java/GenCompat.cpp
+++ b/cpp/src/slice2java/GenCompat.cpp
@@ -3422,6 +3422,12 @@ Slice::GenCompat::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
 
         if(preserved && !basePreserved)
         {
+            out << sp;
+            out << nl << "public Ice.SlicedData " << nl << "ice_getSlicedData()";
+            out << sb;
+            out << nl << "return _slicedData;";
+            out << eb;
+
             out << sp << nl << "public void" << nl << "_write(Ice.OutputStream ostr)";
             out << sb;
             out << nl << "ostr.startException(_slicedData);";
diff --git a/cpp/src/slice2objc/Gen.cpp b/cpp/src/slice2objc/Gen.cpp
index 3aba530c16b..6e34a182f54 100644
--- a/cpp/src/slice2objc/Gen.cpp
+++ b/cpp/src/slice2objc/Gen.cpp
@@ -1157,7 +1157,7 @@ Slice::Gen::TypesVisitor::visitClassDefEnd(const ClassDefPtr& p)
         {
             _M << nl << "-(id<ICESlicedData>) ice_getSlicedData";
             _M << sb;
-            _M << nl << "return iceSlicedData_;";
+            _M << nl << "return ICE_AUTORELEASE(ICE_RETAIN(iceSlicedData_));";
             _M << eb;
 
             _M << nl << "-(void) iceWrite:(id<ICEOutputStream>)ostr";
@@ -1404,6 +1404,11 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
 
         if(preserved && !basePreserved)
         {
+            _M << nl << nl << "-(id<ICESlicedData>) ice_getSlicedData";
+            _M << sb;
+            _M << nl << "return ICE_AUTORELEASE(ICE_RETAIN(slicedData_));";
+            _M << eb;
+
             _M << nl << nl << "-(void) iceWrite:(id<ICEOutputStream>)ostr";
             _M << sb;
             _M << nl << "[ostr startException:slicedData_];";