From 22e849c6f7c15a979345f3f421fefec8801b4251 Mon Sep 17 00:00:00 2001
From: mrkraimer <mrkraimer@comcast.net>
Date: Wed, 31 Mar 2021 07:39:56 -0400
Subject: [PATCH] remove all references to pvaClient

---
 src/Makefile                                | 1 -
 src/special/addRecordRegister.cpp           | 1 -
 src/special/processRecordRegister.cpp       | 1 -
 src/special/pvdbcrAddRecordRegister.cpp     | 2 --
 src/special/pvdbcrProcessRecordRegister.cpp | 6 +++---
 src/special/pvdbcrRemoveRecordRegister.cpp  | 2 --
 src/special/pvdbcrTraceRecordRegister.cpp   | 2 --
 src/special/removeRecordRegister.cpp        | 1 -
 src/special/traceRecordRegister.cpp         | 1 -
 9 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index fe0b788..0e6db8c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -39,7 +39,6 @@ include $(PVDATABASE_SRC)/pvAccess/Makefile
 include $(PVDATABASE_SRC)/special/Makefile
 include $(PVDATABASE_SRC)/support/Makefile
 
-pvDatabase_LIBS += pvaClient
 pvDatabase_LIBS += $(EPICS_BASE_PVA_CORE_LIBS)
 pvDatabase_LIBS += $(EPICS_BASE_IOC_LIBS)
 
diff --git a/src/special/addRecordRegister.cpp b/src/special/addRecordRegister.cpp
index 8ec2158..03fa2c4 100644
--- a/src/special/addRecordRegister.cpp
+++ b/src/special/addRecordRegister.cpp
@@ -18,7 +18,6 @@
 #include <pv/alarm.h>
 #include <pv/pvAlarm.h>
 #include <pv/pvDatabase.h>
-#include <pv/pvaClient.h>
 
 // The following must be the last include for code pvDatabase uses
 #include <epicsExport.h>
diff --git a/src/special/processRecordRegister.cpp b/src/special/processRecordRegister.cpp
index ee77594..bebc999 100644
--- a/src/special/processRecordRegister.cpp
+++ b/src/special/processRecordRegister.cpp
@@ -18,7 +18,6 @@
 #include <pv/alarm.h>
 #include <pv/pvAlarm.h>
 #include <pv/pvDatabase.h>
-#include <pv/pvaClient.h>
 
 // The following must be the last include for code pvDatabase uses
 #include <epicsExport.h>
diff --git a/src/special/pvdbcrAddRecordRegister.cpp b/src/special/pvdbcrAddRecordRegister.cpp
index ae18beb..db1963e 100644
--- a/src/special/pvdbcrAddRecordRegister.cpp
+++ b/src/special/pvdbcrAddRecordRegister.cpp
@@ -15,7 +15,6 @@
 #include <pv/alarm.h>
 #include <pv/pvAlarm.h>
 #include <pv/pvDatabase.h>
-#include <pv/pvaClient.h>
 
 // The following must be the last include for code exampleLink uses
 #include <epicsExport.h>
@@ -24,7 +23,6 @@
 using namespace epics::pvData;
 using namespace epics::pvAccess;
 using namespace epics::pvDatabase;
-using namespace epics::pvaClient;
 using namespace std;
 
 class PvdbcrAddRecord;
diff --git a/src/special/pvdbcrProcessRecordRegister.cpp b/src/special/pvdbcrProcessRecordRegister.cpp
index df7e4cc..e7f1c38 100644
--- a/src/special/pvdbcrProcessRecordRegister.cpp
+++ b/src/special/pvdbcrProcessRecordRegister.cpp
@@ -7,7 +7,9 @@
  * @author mrk
  * @date 2021.03.12
  */
- #include <epicsThread.h>
+#include <epicsThread.h>
+#include <pv/event.h>
+#include <pv/lock.h>
 #include <iocsh.h>
 #include <pv/standardField.h>
 #include <pv/standardPVField.h>
@@ -16,7 +18,6 @@
 #include <pv/alarm.h>
 #include <pv/pvAlarm.h>
 #include <pv/pvDatabase.h>
-#include <pv/pvaClient.h>
 
 // The following must be the last include for code exampleLink uses
 #include <epicsExport.h>
@@ -25,7 +26,6 @@
 using namespace epics::pvData;
 using namespace epics::pvAccess;
 using namespace epics::pvDatabase;
-using namespace epics::pvaClient;
 using namespace std;
 
 typedef std::tr1::shared_ptr<epicsThread> EpicsThreadPtr;
diff --git a/src/special/pvdbcrRemoveRecordRegister.cpp b/src/special/pvdbcrRemoveRecordRegister.cpp
index 477cb51..6fb00ec 100644
--- a/src/special/pvdbcrRemoveRecordRegister.cpp
+++ b/src/special/pvdbcrRemoveRecordRegister.cpp
@@ -15,7 +15,6 @@
 #include <pv/alarm.h>
 #include <pv/pvAlarm.h>
 #include <pv/pvDatabase.h>
-#include <pv/pvaClient.h>
 
 // The following must be the last include for code exampleLink uses
 #include <epicsExport.h>
@@ -24,7 +23,6 @@
 using namespace epics::pvData;
 using namespace epics::pvAccess;
 using namespace epics::pvDatabase;
-using namespace epics::pvaClient;
 using namespace std;
 
 class PvdbcrRemoveRecord;
diff --git a/src/special/pvdbcrTraceRecordRegister.cpp b/src/special/pvdbcrTraceRecordRegister.cpp
index ac394e6..8d06762 100644
--- a/src/special/pvdbcrTraceRecordRegister.cpp
+++ b/src/special/pvdbcrTraceRecordRegister.cpp
@@ -15,7 +15,6 @@
 #include <pv/alarm.h>
 #include <pv/pvAlarm.h>
 #include <pv/pvDatabase.h>
-#include <pv/pvaClient.h>
 
 // The following must be the last include for code exampleLink uses
 #include <epicsExport.h>
@@ -24,7 +23,6 @@
 using namespace epics::pvData;
 using namespace epics::pvAccess;
 using namespace epics::pvDatabase;
-using namespace epics::pvaClient;
 using namespace std;
 
 class PvdbcrTraceRecord;
diff --git a/src/special/removeRecordRegister.cpp b/src/special/removeRecordRegister.cpp
index f57a901..418a9a3 100644
--- a/src/special/removeRecordRegister.cpp
+++ b/src/special/removeRecordRegister.cpp
@@ -19,7 +19,6 @@
 #include <pv/alarm.h>
 #include <pv/pvAlarm.h>
 #include <pv/pvDatabase.h>
-#include <pv/pvaClient.h>
 
 // The following must be the last include for code pvDatabase uses
 #include <epicsExport.h>
diff --git a/src/special/traceRecordRegister.cpp b/src/special/traceRecordRegister.cpp
index c0c87f9..ce555eb 100644
--- a/src/special/traceRecordRegister.cpp
+++ b/src/special/traceRecordRegister.cpp
@@ -18,7 +18,6 @@
 #include <pv/alarm.h>
 #include <pv/pvAlarm.h>
 #include <pv/pvDatabase.h>
-#include <pv/pvaClient.h>
 
 // The following must be the last include for code pvDatabase uses
 #include <epicsExport.h>