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

with help from andrew another attempt to fix windows build

Browse Source
This commit is contained in:
mrkraimer
2018-09-20 09:16:30 -04:00
parent 7491f3b531
commit 7529f58b63
7 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/copy/pvArrayPlugin.cpp
View File

@ -4,11 +4,12 @@
*/ */
#include <stdlib.h> #include <stdlib.h>
#include <pv/pvData.h>
#define epicsExportSharedSymbols #include <pv/bitSet.h>
#include <pv/pvArrayPlugin.h>
#include <pv/convert.h> #include <pv/convert.h>
#include <pv/pvSubArrayCopy.h> #include <pv/pvSubArrayCopy.h>
#define epicsExportSharedSymbols
#include <pv/pvArrayPlugin.h>
using std::string; using std::string;
using std::size_t; using std::size_t;

6
src/copy/pvCopy.cpp
View File

@ -12,11 +12,11 @@
#include <sstream> #include <sstream>
#include <epicsThread.h> #include <epicsThread.h>
#include <pv/pvData.h>
#define epicsExportSharedSymbols #include <pv/bitSet.h>
#include <pv/thread.h> #include <pv/thread.h>
#define epicsExportSharedSymbols
#include <pv/pvCopy.h> #include <pv/pvCopy.h>
#include <pv/pvArrayPlugin.h> #include <pv/pvArrayPlugin.h>
#include <pv/pvTimestampPlugin.h> #include <pv/pvTimestampPlugin.h>

6
src/copy/pvDeadbandPlugin.cpp
View File

@ -4,10 +4,12 @@
*/ */
#include <stdlib.h> #include <stdlib.h>
#define epicsExportSharedSymbols #include <pv/pvData.h>
#include <pv/pvDeadbandPlugin.h> #include <pv/bitSet.h>
#include <pv/convert.h> #include <pv/convert.h>
#include <pv/pvSubArrayCopy.h> #include <pv/pvSubArrayCopy.h>
#define epicsExportSharedSymbols
#include <pv/pvDeadbandPlugin.h>
using std::string; using std::string;
using std::size_t; using std::size_t;

1
src/copy/pvPlugin.cpp
View File

@ -3,6 +3,7 @@
* The License for this software can be found in the file LICENSE that is included with the distribution. * The License for this software can be found in the file LICENSE that is included with the distribution.
*/ */
#include <pv/pvData.h>
#define epicsExportSharedSymbols #define epicsExportSharedSymbols
#include <pv/pvPlugin.h> #include <pv/pvPlugin.h>

6
src/copy/pvTimestampPlugin.cpp
View File

@ -2,9 +2,13 @@
/* /*
* The License for this software can be found in the file LICENSE that is included with the distribution. * The License for this software can be found in the file LICENSE that is included with the distribution.
*/ */
#include <pv/pvData.h>
#include <pv/bitSet.h>
#include <pv/convert.h>
#define epicsExportSharedSymbols #define epicsExportSharedSymbols
#include <pv/pvTimestampPlugin.h> #include <pv/pvTimestampPlugin.h>
#include <pv/convert.h>
#include <pv/pvCopy.h> #include <pv/pvCopy.h>
using std::string; using std::string;

3
src/pv/channelProviderLocal.h
View File

@ -25,7 +25,6 @@
#include <pv/lock.h> #include <pv/lock.h>
#include <pv/pvType.h> #include <pv/pvType.h>
#include <pv/pvData.h> #include <pv/pvData.h>
#include <pv/pvCopy.h>
#include <pv/pvAccess.h> #include <pv/pvAccess.h>
#include <pv/status.h> #include <pv/status.h>
#include <pv/serverContext.h> #include <pv/serverContext.h>
@ -36,7 +35,7 @@
#endif #endif
#include <shareLib.h> #include <shareLib.h>
#include <pv/pvCopy.h>
#include <pv/pvDatabase.h> #include <pv/pvDatabase.h>
namespace epics { namespace pvDatabase { namespace epics { namespace pvDatabase {

2
src/pv/pvDatabase.h
View File

@ -15,7 +15,6 @@
#include <map> #include <map>
#include <pv/pvData.h> #include <pv/pvData.h>
#include <pv/pvCopy.h>
#include <pv/pvTimeStamp.h> #include <pv/pvTimeStamp.h>
#include <pv/rpcService.h> #include <pv/rpcService.h>
@ -25,6 +24,7 @@
#endif #endif
#include <shareLib.h> #include <shareLib.h>
#include <pv/pvCopy.h>
namespace epics { namespace pvDatabase { namespace epics { namespace pvDatabase {