From 763c41caa397277d81307d5e3cf471b880bb5e94 Mon Sep 17 00:00:00 2001 From: mrkraimer Date: Fri, 5 Apr 2019 14:37:05 -0400 Subject: [PATCH] setElementData=>setData --- src/pv/pvaClient.h | 2 +- src/pvaClientMonitor.cpp | 2 +- src/pvaClientMonitorData.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pv/pvaClient.h b/src/pv/pvaClient.h index 3e302c9..ff439e0 100644 --- a/src/pv/pvaClient.h +++ b/src/pv/pvaClient.h @@ -743,7 +743,7 @@ public: * NOTE: Not normally called by clients * @param monitorElement the monitorElement that has new data. */ - void setElementData(epics::pvData::MonitorElementPtr const & monitorElement); + void setData(epics::pvData::MonitorElementPtr const & monitorElement); /** Factory method for creating an instance of PvaClientGetData. * NOTE: Not normally called by clients * @param structure Introspection interface diff --git a/src/pvaClientMonitor.cpp b/src/pvaClientMonitor.cpp index 2fe0753..e253366 100644 --- a/src/pvaClientMonitor.cpp +++ b/src/pvaClientMonitor.cpp @@ -437,7 +437,7 @@ bool PvaClientMonitor::poll() monitorElement = monitor->poll(); if(!monitorElement) return false; userPoll = true; - pvaClientData->setElementData(monitorElement); + pvaClientData->setData(monitorElement); return true; } diff --git a/src/pvaClientMonitorData.cpp b/src/pvaClientMonitorData.cpp index 25806fe..7c5d1da 100644 --- a/src/pvaClientMonitorData.cpp +++ b/src/pvaClientMonitorData.cpp @@ -56,11 +56,11 @@ PvaClientMonitorData::PvaClientMonitorData(StructureConstPtr const & structure) { } -void PvaClientMonitorData::setElementData(MonitorElementPtr const & monitorElement) +void PvaClientMonitorData::setData(MonitorElementPtr const & monitorElement) { PVStructurePtr pvStructure = monitorElement->pvStructurePtr; BitSetPtr changedBitSet = monitorElement->changedBitSet; - setData(pvStructure,changedBitSet); + PvaClientData::setData(pvStructure,changedBitSet); overrunBitSet = monitorElement->overrunBitSet; }