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

pvCopy depends of pvPlugin not the other way

Browse Source
This commit is contained in:
mrkraimer
2019-06-23 14:03:16 -04:00
parent d9ed321298
commit 1928b87634
6 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/copy/Makefile
View File

@ -8,14 +8,14 @@ SHRLIB_VERSION ?= $(EPICS_PVA_MAJOR_VERSION).$(EPICS_PVA_MINOR_VERSION).$(EPICS_
# needed for Windows # needed for Windows
LIB_SYS_LIBS_WIN32 += netapi32 ws2_32 LIB_SYS_LIBS_WIN32 += netapi32 ws2_32
INC += pv/pvStructureCopy.h
INC += pv/pvPlugin.h INC += pv/pvPlugin.h
INC += pv/pvStructureCopy.h
INC += pv/pvArrayPlugin.h INC += pv/pvArrayPlugin.h
INC += pv/pvDeadbandPlugin.h INC += pv/pvDeadbandPlugin.h
INC += pv/pvTimestampPlugin.h INC += pv/pvTimestampPlugin.h
LIBSRCS += pvCopy.cpp
LIBSRCS += pvPlugin.cpp LIBSRCS += pvPlugin.cpp
LIBSRCS += pvCopy.cpp
LIBSRCS += pvArrayPlugin.cpp LIBSRCS += pvArrayPlugin.cpp
LIBSRCS += pvDeadbandPlugin.cpp LIBSRCS += pvDeadbandPlugin.cpp
LIBSRCS += pvTimestampPlugin.cpp LIBSRCS += pvTimestampPlugin.cpp

5
src/copy/pv/pvPlugin.h
View File

@ -12,7 +12,7 @@
#include <string> #include <string>
#include <map> #include <map>
#include <pv/lock.h> #include <pv/lock.h>
#include <pv/pvStructureCopy.h> #include <pv/bitSet.h>
#include <shareLib.h> #include <shareLib.h>
@ -22,6 +22,9 @@ class PVPlugin;
class PVFilter; class PVFilter;
class PVPluginRegistry; class PVPluginRegistry;
class PVCopy;
typedef std::tr1::shared_ptr<PVCopy> PVCopyPtr;
typedef std::tr1::shared_ptr<PVPlugin> PVPluginPtr; typedef std::tr1::shared_ptr<PVPlugin> PVPluginPtr;
typedef std::tr1::shared_ptr<PVFilter> PVFilterPtr; typedef std::tr1::shared_ptr<PVFilter> PVFilterPtr;
typedef std::map<std::string,PVPluginPtr> PVPluginMap; typedef std::map<std::string,PVPluginPtr> PVPluginMap;

2
src/copy/pvArrayPlugin.cpp
View File

@ -7,7 +7,7 @@
#include <pv/pvData.h> #include <pv/pvData.h>
#include <pv/bitSet.h> #include <pv/bitSet.h>
#include <pv/convert.h> #include <pv/convert.h>
#include "pv/pvSubArrayCopy.h" #include <pv/pvSubArrayCopy.h>
#define epicsExportSharedSymbols #define epicsExportSharedSymbols
#include "pv/pvArrayPlugin.h" #include "pv/pvArrayPlugin.h"

1
src/copy/pvDeadbandPlugin.cpp
View File

@ -11,7 +11,6 @@
#include <pv/pvPlugin.h> #include <pv/pvPlugin.h>
#include <pv/bitSet.h> #include <pv/bitSet.h>
#include <pv/convert.h> #include <pv/convert.h>
#include "pv/pvSubArrayCopy.h"
#define epicsExportSharedSymbols #define epicsExportSharedSymbols
#include "pv/pvDeadbandPlugin.h" #include "pv/pvDeadbandPlugin.h"

2
src/copy/pvPlugin.cpp
View File

@ -7,7 +7,7 @@
#include <string> #include <string>
#include <map> #include <map>
#include <pv/lock.h> #include <pv/lock.h>
#include "pv/pvStructureCopy.h" #include <pv/bitSet.h>
#define epicsExportSharedSymbols #define epicsExportSharedSymbols
#include "pv/pvPlugin.h" #include "pv/pvPlugin.h"

1
src/copy/pvTimestampPlugin.cpp
View File

@ -10,7 +10,6 @@
#include <pv/bitSet.h> #include <pv/bitSet.h>
#include <pv/convert.h> #include <pv/convert.h>
#include <pv/pvTimeStamp.h> #include <pv/pvTimeStamp.h>
#include "pv/pvStructureCopy.h"
#define epicsExportSharedSymbols #define epicsExportSharedSymbols
#include "pv/pvTimestampPlugin.h" #include "pv/pvTimestampPlugin.h"