fix bug in processRecord; attempt to make support build on WINE
This commit is contained in:
@ -1,11 +1,6 @@
|
||||
TODO
|
||||
===========
|
||||
|
||||
unlisten and detach
|
||||
-------------------
|
||||
|
||||
Why do both unlisten and detach exists?
|
||||
|
||||
|
||||
create more regression tests
|
||||
----------------
|
||||
|
@ -92,7 +92,7 @@ void ProcessRecord::process()
|
||||
epicsGuard<epics::pvData::Mutex> guard(mutex);
|
||||
std::map<std::string,PVRecordPtr>::iterator iter = pvRecordMap.find(recordName);
|
||||
if(iter!=pvRecordMap.end()) {
|
||||
pvResult->put(recordName + " already pesent");
|
||||
pvResult->put(recordName + " already present");
|
||||
return;
|
||||
}
|
||||
PVRecordPtr pvRecord = pvDatabase->findRecord(recordName);
|
||||
@ -110,8 +110,7 @@ void ProcessRecord::process()
|
||||
pvResult->put(recordName + " not found");
|
||||
return;
|
||||
}
|
||||
PVRecordPtr pvRecord = (*iter).second;
|
||||
pvDatabase->removeRecord(pvRecord);
|
||||
pvRecordMap.erase(iter);
|
||||
pvResult->put("success");
|
||||
return;
|
||||
} else {
|
||||
|
@ -12,6 +12,8 @@
|
||||
#include <pv/pvSupport.h>
|
||||
#include <pv/convert.h>
|
||||
#include <pv/standardField.h>
|
||||
#include <pv/pvStructureCopy.h>
|
||||
|
||||
|
||||
#define epicsExportSharedSymbols
|
||||
|
||||
|
@ -14,6 +14,8 @@
|
||||
#include <pv/standardField.h>
|
||||
#include <pv/alarm.h>
|
||||
#include <pv/pvAlarm.h>
|
||||
#include <pv/pvStructureCopy.h>
|
||||
|
||||
|
||||
#define epicsExportSharedSymbols
|
||||
|
||||
|
Reference in New Issue
Block a user