Skip to content
Snippets Groups Projects
Commit aee14a43 authored by Peter Kaiser's avatar Peter Kaiser
Browse files

Fix #1646

parent 6e7277db
No related branches found
No related tags found
No related merge requests found
......@@ -145,6 +145,27 @@ namespace armarx {
}
}
#if ICE_INT_VERSION >= 30500
void LinkedPose::__read(IceInternal::BasicStream *__is)
{
LinkedPoseBase::__read(__is);
if(referenceRobot)
{
//ARMARX_WARNING_S << "Calling referenceRobot->ref() in __read(IceInternal::BasicStream *__is, bool __rid) of LinkedPose";
referenceRobot->ref();
}
}
void LinkedPose::__read(const Ice::InputStreamPtr &__is)
{
LinkedPoseBase::__read(__is);
if(referenceRobot)
{
//ARMARX_WARNING_S << "Calling referenceRobot->ref() in __read(const Ice::InputStreamPtr &__is, bool __rid) of LinkedPose";
referenceRobot->ref();
}
}
#else
void LinkedPose::__read(IceInternal::BasicStream *__is, bool __rid)
{
LinkedPoseBase::__read(__is, __rid);
......@@ -164,6 +185,7 @@ namespace armarx {
referenceRobot->ref();
}
}
#endif
/*void LinkedPose::__write(IceInternal::BasicStream *__os) const
{
......
......@@ -127,8 +127,13 @@ namespace armarx
virtual void serialize(const armarx::ObjectSerializerBasePtr& serializer, const ::Ice::Current& = ::Ice::Current()) const;
virtual void deserialize(const armarx::ObjectSerializerBasePtr& serializer, const ::Ice::Current& = ::Ice::Current());
#if ICE_INT_VERSION >= 30500
virtual void __read(::IceInternal::BasicStream *__is);
virtual void __read(const ::Ice::InputStreamPtr &__is);
#else
virtual void __read(::IceInternal::BasicStream *__is, bool __rid);
virtual void __read(const ::Ice::InputStreamPtr &__is, bool __rid);
#endif
};
typedef IceInternal::Handle<LinkedPose> LinkedPosePtr;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment