remove all references to pvaClient
This commit is contained in:
@ -39,7 +39,6 @@ include $(PVDATABASE_SRC)/pvAccess/Makefile
|
|||||||
include $(PVDATABASE_SRC)/special/Makefile
|
include $(PVDATABASE_SRC)/special/Makefile
|
||||||
include $(PVDATABASE_SRC)/support/Makefile
|
include $(PVDATABASE_SRC)/support/Makefile
|
||||||
|
|
||||||
pvDatabase_LIBS += pvaClient
|
|
||||||
pvDatabase_LIBS += $(EPICS_BASE_PVA_CORE_LIBS)
|
pvDatabase_LIBS += $(EPICS_BASE_PVA_CORE_LIBS)
|
||||||
pvDatabase_LIBS += $(EPICS_BASE_IOC_LIBS)
|
pvDatabase_LIBS += $(EPICS_BASE_IOC_LIBS)
|
||||||
|
|
||||||
|
@ -18,7 +18,6 @@
|
|||||||
#include <pv/alarm.h>
|
#include <pv/alarm.h>
|
||||||
#include <pv/pvAlarm.h>
|
#include <pv/pvAlarm.h>
|
||||||
#include <pv/pvDatabase.h>
|
#include <pv/pvDatabase.h>
|
||||||
#include <pv/pvaClient.h>
|
|
||||||
|
|
||||||
// The following must be the last include for code pvDatabase uses
|
// The following must be the last include for code pvDatabase uses
|
||||||
#include <epicsExport.h>
|
#include <epicsExport.h>
|
||||||
|
@ -18,7 +18,6 @@
|
|||||||
#include <pv/alarm.h>
|
#include <pv/alarm.h>
|
||||||
#include <pv/pvAlarm.h>
|
#include <pv/pvAlarm.h>
|
||||||
#include <pv/pvDatabase.h>
|
#include <pv/pvDatabase.h>
|
||||||
#include <pv/pvaClient.h>
|
|
||||||
|
|
||||||
// The following must be the last include for code pvDatabase uses
|
// The following must be the last include for code pvDatabase uses
|
||||||
#include <epicsExport.h>
|
#include <epicsExport.h>
|
||||||
|
@ -15,7 +15,6 @@
|
|||||||
#include <pv/alarm.h>
|
#include <pv/alarm.h>
|
||||||
#include <pv/pvAlarm.h>
|
#include <pv/pvAlarm.h>
|
||||||
#include <pv/pvDatabase.h>
|
#include <pv/pvDatabase.h>
|
||||||
#include <pv/pvaClient.h>
|
|
||||||
|
|
||||||
// The following must be the last include for code exampleLink uses
|
// The following must be the last include for code exampleLink uses
|
||||||
#include <epicsExport.h>
|
#include <epicsExport.h>
|
||||||
@ -24,7 +23,6 @@
|
|||||||
using namespace epics::pvData;
|
using namespace epics::pvData;
|
||||||
using namespace epics::pvAccess;
|
using namespace epics::pvAccess;
|
||||||
using namespace epics::pvDatabase;
|
using namespace epics::pvDatabase;
|
||||||
using namespace epics::pvaClient;
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
class PvdbcrAddRecord;
|
class PvdbcrAddRecord;
|
||||||
|
@ -8,6 +8,8 @@
|
|||||||
* @date 2021.03.12
|
* @date 2021.03.12
|
||||||
*/
|
*/
|
||||||
#include <epicsThread.h>
|
#include <epicsThread.h>
|
||||||
|
#include <pv/event.h>
|
||||||
|
#include <pv/lock.h>
|
||||||
#include <iocsh.h>
|
#include <iocsh.h>
|
||||||
#include <pv/standardField.h>
|
#include <pv/standardField.h>
|
||||||
#include <pv/standardPVField.h>
|
#include <pv/standardPVField.h>
|
||||||
@ -16,7 +18,6 @@
|
|||||||
#include <pv/alarm.h>
|
#include <pv/alarm.h>
|
||||||
#include <pv/pvAlarm.h>
|
#include <pv/pvAlarm.h>
|
||||||
#include <pv/pvDatabase.h>
|
#include <pv/pvDatabase.h>
|
||||||
#include <pv/pvaClient.h>
|
|
||||||
|
|
||||||
// The following must be the last include for code exampleLink uses
|
// The following must be the last include for code exampleLink uses
|
||||||
#include <epicsExport.h>
|
#include <epicsExport.h>
|
||||||
@ -25,7 +26,6 @@
|
|||||||
using namespace epics::pvData;
|
using namespace epics::pvData;
|
||||||
using namespace epics::pvAccess;
|
using namespace epics::pvAccess;
|
||||||
using namespace epics::pvDatabase;
|
using namespace epics::pvDatabase;
|
||||||
using namespace epics::pvaClient;
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
typedef std::tr1::shared_ptr<epicsThread> EpicsThreadPtr;
|
typedef std::tr1::shared_ptr<epicsThread> EpicsThreadPtr;
|
||||||
|
@ -15,7 +15,6 @@
|
|||||||
#include <pv/alarm.h>
|
#include <pv/alarm.h>
|
||||||
#include <pv/pvAlarm.h>
|
#include <pv/pvAlarm.h>
|
||||||
#include <pv/pvDatabase.h>
|
#include <pv/pvDatabase.h>
|
||||||
#include <pv/pvaClient.h>
|
|
||||||
|
|
||||||
// The following must be the last include for code exampleLink uses
|
// The following must be the last include for code exampleLink uses
|
||||||
#include <epicsExport.h>
|
#include <epicsExport.h>
|
||||||
@ -24,7 +23,6 @@
|
|||||||
using namespace epics::pvData;
|
using namespace epics::pvData;
|
||||||
using namespace epics::pvAccess;
|
using namespace epics::pvAccess;
|
||||||
using namespace epics::pvDatabase;
|
using namespace epics::pvDatabase;
|
||||||
using namespace epics::pvaClient;
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
class PvdbcrRemoveRecord;
|
class PvdbcrRemoveRecord;
|
||||||
|
@ -15,7 +15,6 @@
|
|||||||
#include <pv/alarm.h>
|
#include <pv/alarm.h>
|
||||||
#include <pv/pvAlarm.h>
|
#include <pv/pvAlarm.h>
|
||||||
#include <pv/pvDatabase.h>
|
#include <pv/pvDatabase.h>
|
||||||
#include <pv/pvaClient.h>
|
|
||||||
|
|
||||||
// The following must be the last include for code exampleLink uses
|
// The following must be the last include for code exampleLink uses
|
||||||
#include <epicsExport.h>
|
#include <epicsExport.h>
|
||||||
@ -24,7 +23,6 @@
|
|||||||
using namespace epics::pvData;
|
using namespace epics::pvData;
|
||||||
using namespace epics::pvAccess;
|
using namespace epics::pvAccess;
|
||||||
using namespace epics::pvDatabase;
|
using namespace epics::pvDatabase;
|
||||||
using namespace epics::pvaClient;
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
class PvdbcrTraceRecord;
|
class PvdbcrTraceRecord;
|
||||||
|
@ -19,7 +19,6 @@
|
|||||||
#include <pv/alarm.h>
|
#include <pv/alarm.h>
|
||||||
#include <pv/pvAlarm.h>
|
#include <pv/pvAlarm.h>
|
||||||
#include <pv/pvDatabase.h>
|
#include <pv/pvDatabase.h>
|
||||||
#include <pv/pvaClient.h>
|
|
||||||
|
|
||||||
// The following must be the last include for code pvDatabase uses
|
// The following must be the last include for code pvDatabase uses
|
||||||
#include <epicsExport.h>
|
#include <epicsExport.h>
|
||||||
|
@ -18,7 +18,6 @@
|
|||||||
#include <pv/alarm.h>
|
#include <pv/alarm.h>
|
||||||
#include <pv/pvAlarm.h>
|
#include <pv/pvAlarm.h>
|
||||||
#include <pv/pvDatabase.h>
|
#include <pv/pvDatabase.h>
|
||||||
#include <pv/pvaClient.h>
|
|
||||||
|
|
||||||
// The following must be the last include for code pvDatabase uses
|
// The following must be the last include for code pvDatabase uses
|
||||||
#include <epicsExport.h>
|
#include <epicsExport.h>
|
||||||
|
Reference in New Issue
Block a user