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
src/pipelineService/pipelineServer.cpp
+4 -4
View File
@@ -250,7 +250,7 @@ public:
return m_requestedCount;
}
virtual epics::pvData::MonitorElement::shared_pointer getFreeElement() {
virtual MonitorElement::shared_pointer getFreeElement() {
Lock guard(m_freeQueueLock);
if (m_freeQueue.empty())
return m_nullMonitorElement;
@@ -261,7 +261,7 @@ public:
return freeElement;
}
virtual void putElement(epics::pvData::MonitorElement::shared_pointer const & element) {
virtual void putElement(MonitorElement::shared_pointer const & element) {
bool notify = false;
{
@@ -430,8 +430,8 @@ public:
return nullPtr;
}
virtual epics::pvData::Monitor::shared_pointer createMonitor(
epics::pvData::MonitorRequester::shared_pointer const & monitorRequester,
virtual Monitor::shared_pointer createMonitor(
MonitorRequester::shared_pointer const & monitorRequester,
epics::pvData::PVStructure::shared_pointer const & pvRequest)
{
if (!pvRequest)