From bd37756ba309091df88fdd4ee8b2d428c243dce3 Mon Sep 17 00:00:00 2001 From: mrkraimer Date: Fri, 21 Jun 2019 13:39:50 -0400 Subject: [PATCH] fix bug in processRecord; attempt to make support build on WINE --- documentation/TODO.md | 5 ----- src/special/processRecord.cpp | 5 ++--- src/support/controlSupport.cpp | 2 ++ src/support/scalarAlarmSupport.cpp | 2 ++ 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/documentation/TODO.md b/documentation/TODO.md index fd9f388..8a6b69a 100644 --- a/documentation/TODO.md +++ b/documentation/TODO.md @@ -1,11 +1,6 @@ TODO =========== -unlisten and detach -------------------- - -Why do both unlisten and detach exists? - create more regression tests ---------------- diff --git a/src/special/processRecord.cpp b/src/special/processRecord.cpp index 76a6347..0e77ce2 100644 --- a/src/special/processRecord.cpp +++ b/src/special/processRecord.cpp @@ -92,7 +92,7 @@ void ProcessRecord::process() epicsGuard guard(mutex); std::map::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 { diff --git a/src/support/controlSupport.cpp b/src/support/controlSupport.cpp index baab7ec..ebde932 100644 --- a/src/support/controlSupport.cpp +++ b/src/support/controlSupport.cpp @@ -12,6 +12,8 @@ #include #include #include +#include + #define epicsExportSharedSymbols diff --git a/src/support/scalarAlarmSupport.cpp b/src/support/scalarAlarmSupport.cpp index a1df747..fb626e1 100644 --- a/src/support/scalarAlarmSupport.cpp +++ b/src/support/scalarAlarmSupport.cpp @@ -14,6 +14,8 @@ #include #include #include +#include + #define epicsExportSharedSymbols