epics/pvAccess
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

vxWorks port: boost shared_ptr variance (take 1)

Browse Source
This commit is contained in:
Matej Sekoranja
2014-06-11 12:46:29 +02:00
parent edfae4e69e
commit ff07c36a7b
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/rpcService/rpcServer.cpp
View File

@@ -73,7 +73,8 @@ class ChannelRPCServiceImpl :
status = Status(Status::STATUSTYPE_FATAL, "RPCService.request(PVStructure) returned null.");
}
m_channelRPCRequester->requestDone(status, shared_from_this(), result);
ChannelRPC::shared_pointer thisPtr(shared_from_this());
m_channelRPCRequester->requestDone(status, thisPtr, result);
if (m_lastRequest.get())
destroy();
@@ -256,8 +257,9 @@ public:
return nullPtr;
}
Channel::shared_pointer thisPtr(shared_from_this());
ChannelRPC::shared_pointer channelRPCImpl(
new ChannelRPCServiceImpl(shared_from_this(), channelRPCRequester, m_rpcService)
new ChannelRPCServiceImpl(thisPtr, channelRPCRequester, m_rpcService)
);
channelRPCRequester->channelRPCConnect(Status::Ok, channelRPCImpl);
return channelRPCImpl;