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

fix bug in monitorQueue.cpp

Browse Source
This commit is contained in:
Marty Kraimer
2011-05-19 12:02:47 -04:00
parent 8a34a9e52a
commit 89daa1dac1
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure/RELEASE
View File

@@ -22,7 +22,9 @@ TEMPLATE_TOP=$(EPICS_BASE)/templates/makeBaseApp/top
#SNCSEQ=$(EPICS_BASE)/../modules/soft/seq
# EPICS_BASE usually appears last so other apps can override stuff:
EPICS_BASE=/opt/epics/base
#EPICS_BASE=/opt/epics/base
EPICS_BASE=/home/install/epics/base
#Capfast users may need the following definitions
#CAPFAST_TEMPLATES=

3
pvDataApp/monitor/monitorQueue.cpp
View File

@@ -95,6 +95,7 @@ MonitorQueue::MonitorQueue(PVStructureSharedPointerPtrArray structures,int numbe
MonitorQueue::~MonitorQueue()
{
delete queue;
for(int i=0; i<number; i++) delete structures[i];
delete[] structures;
}
@@ -126,7 +127,7 @@ int MonitorQueue::capacity()
MonitorElement::shared_pointer const & MonitorQueue::getFree()
{
MonitorQueueElement *queueElement = queue->getUsed();
MonitorQueueElement *queueElement = queue->getFree();
if(queueElement==0) return nullElement;
return *queueElement->getObject();
}