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

used aliased names for Monitor*

Browse Source
This commit is contained in:
Michael Davidsaver
2016-02-26 16:52:57 -05:00
parent 7af6031da6
commit 15449dde6b
8 changed files with 65 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ca/caChannel.cpp
View File

@@ -363,8 +363,8 @@ ChannelRPC::shared_pointer CAChannel::createChannelRPC(
}
epics::pvData::Monitor::shared_pointer CAChannel::createMonitor(
epics::pvData::MonitorRequester::shared_pointer const & monitorRequester,
Monitor::shared_pointer CAChannel::createMonitor(
MonitorRequester::shared_pointer const & monitorRequester,
epics::pvData::PVStructure::shared_pointer const & pvRequest)
{
return CAChannelMonitor::create(shared_from_this(), monitorRequester, pvRequest);
@@ -1280,7 +1280,7 @@ void CAChannelPut::unlock()
Monitor::shared_pointer CAChannelMonitor::create(
CAChannel::shared_pointer const & channel,
epics::pvData::MonitorRequester::shared_pointer const & monitorRequester,
MonitorRequester::shared_pointer const & monitorRequester,
epics::pvData::PVStructure::shared_pointer const & pvRequest)
{
// TODO use std::make_shared
@@ -1300,7 +1300,7 @@ CAChannelMonitor::~CAChannelMonitor()
CAChannelMonitor::CAChannelMonitor(CAChannel::shared_pointer const & _channel,
epics::pvData::MonitorRequester::shared_pointer const & _monitorRequester,
MonitorRequester::shared_pointer const & _monitorRequester,
epics::pvData::PVStructure::shared_pointer const & pvRequest) :
channel(_channel),
monitorRequester(_monitorRequester),
@@ -1329,7 +1329,7 @@ void CAChannelMonitor::activate()
}
/* --------------- epics::pvData::Monitor --------------- */
/* --------------- Monitor --------------- */
static void ca_subscription_handler(struct event_handler_args args)
@@ -1418,7 +1418,7 @@ epics::pvData::Status CAChannelMonitor::stop()
}
epics::pvData::MonitorElementPtr CAChannelMonitor::poll()
MonitorElementPtr CAChannelMonitor::poll()
{
Lock lock(mutex);
if (count)
@@ -1433,7 +1433,7 @@ epics::pvData::MonitorElementPtr CAChannelMonitor::poll()
}
void CAChannelMonitor::release(epics::pvData::MonitorElementPtr const & /*monitorElement*/)
void CAChannelMonitor::release(MonitorElementPtr const & /*monitorElement*/)
{
// noop
}