MonitorElement remove unused

This commit is contained in:
Michael Davidsaver
2017-07-19 19:30:42 +02:00
parent 3904c11040
commit b53761d4d4
3 changed files with 1 additions and 8 deletions

View File

@ -22,6 +22,7 @@ Release 6.0.0 (UNRELEASED)
The "pva" and "ca" providers are registered with the clients() singleton. The "pva" and "ca" providers are registered with the clients() singleton.
epics::pvAccess::ServerContext() looks up names with the servers() singleton. epics::pvAccess::ServerContext() looks up names with the servers() singleton.
- Removed deprecated epics::pvAccess::Properties - Removed deprecated epics::pvAccess::Properties
- The data members of epics::pvAccess::MonitorElement become const, preventing these pointers from being re-targeted.
- Simplifications - Simplifications
- use of the epics::pvAccess::ChannelRequester interface is optional - use of the epics::pvAccess::ChannelRequester interface is optional
and may be omitted when calling createChannel(). and may be omitted when calling createChannel().

View File

@ -49,17 +49,10 @@ typedef std::tr1::shared_ptr<Monitor> MonitorPtr;
class epicsShareClass MonitorElement { class epicsShareClass MonitorElement {
public: public:
POINTER_DEFINITIONS(MonitorElement); POINTER_DEFINITIONS(MonitorElement);
MonitorElement(){}
MonitorElement(epics::pvData::PVStructurePtr const & pvStructurePtr); MonitorElement(epics::pvData::PVStructurePtr const & pvStructurePtr);
const epics::pvData::PVStructurePtr pvStructurePtr; const epics::pvData::PVStructurePtr pvStructurePtr;
const epics::pvData::BitSet::shared_pointer changedBitSet; const epics::pvData::BitSet::shared_pointer changedBitSet;
const epics::pvData::BitSet::shared_pointer overrunBitSet; 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; class Ref;
}; };

View File

@ -143,7 +143,6 @@ MonitorElement::MonitorElement(epics::pvData::PVStructurePtr const & pvStructure
: pvStructurePtr(pvStructurePtr) : pvStructurePtr(pvStructurePtr)
,changedBitSet(epics::pvData::BitSet::create(static_cast<epics::pvData::uint32>(pvStructurePtr->getNumberFields()))) ,changedBitSet(epics::pvData::BitSet::create(static_cast<epics::pvData::uint32>(pvStructurePtr->getNumberFields())))
,overrunBitSet(epics::pvData::BitSet::create(static_cast<epics::pvData::uint32>(pvStructurePtr->getNumberFields()))) ,overrunBitSet(epics::pvData::BitSet::create(static_cast<epics::pvData::uint32>(pvStructurePtr->getNumberFields())))
,state(Free)
{} {}
}} // namespace epics::pvAccess }} // namespace epics::pvAccess