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

Merge https://github.com/epics-base/pvAccessCPP

Browse Source 
Get up to date with epics-base
This commit is contained in:
mrkraimer
2018-03-14 06:08:47 -04:00
parent 3592b2dade 8d262fc9fe
commit 2f29aeec8d
6 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/client/pvAccess.cpp
+25 -5
View File
@@ -259,19 +259,39 @@ struct Get2PutProxy : public ChannelGet
ChannelPut::shared_pointer op; // the put we wrap
std::tr1::shared_ptr<Get2PutProxy::Req> op_request; // keep our Req alive
ChannelPut::shared_pointer OP() {
epicsGuard<epicsMutex> G(op_request->mutex);
return op;
}
Get2PutProxy() {}
virtual ~Get2PutProxy() {}
virtual void destroy() OVERRIDE FINAL
{ op->destroy(); }
{
ChannelPut::shared_pointer O(OP());
if(O) O->destroy();
}
virtual std::tr1::shared_ptr<Channel> getChannel() OVERRIDE FINAL
{ return op->getChannel(); }
{
ChannelPut::shared_pointer O(OP());
return O ? O->getChannel() : std::tr1::shared_ptr<Channel>();
}
virtual void cancel() OVERRIDE FINAL
{ op->cancel(); }
{
ChannelPut::shared_pointer O(OP());
if(O) O->cancel();
}
virtual void lastRequest() OVERRIDE FINAL
{ op->lastRequest(); }
{
ChannelPut::shared_pointer O(OP());
if(O) O->lastRequest();
}
virtual void get() OVERRIDE FINAL
{ op->get(); }
{
ChannelPut::shared_pointer O(OP());
if(O) O->get();
}
};
}// namespace