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

more shared_ptr compat

Browse Source
This commit is contained in:
Michael Davidsaver
2017-07-19 11:33:47 +02:00
parent d2df03ff79
commit ab55a4eeb4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/spamme.cpp
View File

@ -225,7 +225,7 @@ struct SpamChannel : public pva::Channel,
virtual pva::Monitor::shared_pointer createMonitor(const pva::MonitorRequester::shared_pointer &requester, virtual pva::Monitor::shared_pointer createMonitor(const pva::MonitorRequester::shared_pointer &requester,
const pvd::PVStructure::shared_pointer &pvRequest) OVERRIDE FINAL const pvd::PVStructure::shared_pointer &pvRequest) OVERRIDE FINAL
{ {
pva::Monitor::shared_pointer ret(new SpamMonitor(shared_from_this(), requester, pvRequest)); std::tr1::shared_ptr<SpamMonitor> ret(new SpamMonitor(shared_from_this(), requester, pvRequest));
requester->monitorConnect(pvd::Status::Ok, ret, spamtype); requester->monitorConnect(pvd::Status::Ok, ret, spamtype);
return ret; return ret;
} }
@ -262,7 +262,7 @@ struct SpamProvider : public pva::ChannelProvider,
pva::ChannelRequester::shared_pointer const & requester, pva::ChannelRequester::shared_pointer const & requester,
short priority, std::string const & address) OVERRIDE FINAL short priority, std::string const & address) OVERRIDE FINAL
{ {
pva::Channel::shared_pointer ret; std::tr1::shared_ptr<SpamChannel> ret;
if(name==channelName) { if(name==channelName) {
ret.reset(new SpamChannel(shared_from_this(), channelName, requester)); ret.reset(new SpamChannel(shared_from_this(), channelName, requester));
} }