From b53761d4d4ff3880d2d03c743b8952edfb44bc1d Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Wed, 19 Jul 2017 19:30:42 +0200 Subject: [PATCH] MonitorElement remove unused --- documentation/release_notes.h | 1 + src/client/pv/monitor.h | 7 ------- src/client/pvAccess.cpp | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/documentation/release_notes.h b/documentation/release_notes.h index bb47f7a..0729638 100644 --- a/documentation/release_notes.h +++ b/documentation/release_notes.h @@ -22,6 +22,7 @@ Release 6.0.0 (UNRELEASED) The "pva" and "ca" providers are registered with the clients() singleton. epics::pvAccess::ServerContext() looks up names with the servers() singleton. - Removed deprecated epics::pvAccess::Properties + - The data members of epics::pvAccess::MonitorElement become const, preventing these pointers from being re-targeted. - Simplifications - use of the epics::pvAccess::ChannelRequester interface is optional and may be omitted when calling createChannel(). diff --git a/src/client/pv/monitor.h b/src/client/pv/monitor.h index 2f6a2d5..1d56398 100644 --- a/src/client/pv/monitor.h +++ b/src/client/pv/monitor.h @@ -49,17 +49,10 @@ typedef std::tr1::shared_ptr MonitorPtr; class epicsShareClass MonitorElement { public: POINTER_DEFINITIONS(MonitorElement); - MonitorElement(){} MonitorElement(epics::pvData::PVStructurePtr const & pvStructurePtr); const epics::pvData::PVStructurePtr pvStructurePtr; const epics::pvData::BitSet::shared_pointer changedBitSet; const epics::pvData::BitSet::shared_pointer overrunBitSet; - // info to assist monitor debugging - enum state_t { - Free, //!< data invalid. eg. on internal free list - Queued, //!< data valid. Owned by Monitor. Waiting for Monitor::poll() - InUse //!< data valid. Owned by MonitorRequester. Waiting for Monitor::release() - } state; class Ref; }; diff --git a/src/client/pvAccess.cpp b/src/client/pvAccess.cpp index 7577adb..731b752 100644 --- a/src/client/pvAccess.cpp +++ b/src/client/pvAccess.cpp @@ -143,7 +143,6 @@ MonitorElement::MonitorElement(epics::pvData::PVStructurePtr const & pvStructure : pvStructurePtr(pvStructurePtr) ,changedBitSet(epics::pvData::BitSet::create(static_cast(pvStructurePtr->getNumberFields()))) ,overrunBitSet(epics::pvData::BitSet::create(static_cast(pvStructurePtr->getNumberFields()))) - ,state(Free) {} }} // namespace epics::pvAccess