with help from Andrew another attempt to fix windows build
This commit is contained in:
@ -16,8 +16,8 @@
|
|||||||
#include <pv/bitSet.h>
|
#include <pv/bitSet.h>
|
||||||
#include <pv/thread.h>
|
#include <pv/thread.h>
|
||||||
|
|
||||||
#include <pv/pvPlugin.h>
|
|
||||||
#define epicsExportSharedSymbols
|
#define epicsExportSharedSymbols
|
||||||
|
#include <pv/pvPlugin.h>
|
||||||
#include <pv/pvStructureCopy.h>
|
#include <pv/pvStructureCopy.h>
|
||||||
|
|
||||||
using std::tr1::static_pointer_cast;
|
using std::tr1::static_pointer_cast;
|
||||||
|
@ -4,8 +4,8 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include <pv/pvData.h>
|
#include <pv/pvData.h>
|
||||||
#include <pv/pvStructureCopy.h>
|
|
||||||
#define epicsExportSharedSymbols
|
#define epicsExportSharedSymbols
|
||||||
|
#include <pv/pvStructureCopy.h>
|
||||||
#include <pv/pvPlugin.h>
|
#include <pv/pvPlugin.h>
|
||||||
|
|
||||||
using namespace epics::pvData;
|
using namespace epics::pvData;
|
||||||
|
@ -10,16 +10,14 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include <epicsGuard.h>
|
#include <epicsGuard.h>
|
||||||
|
#define epicsExportSharedSymbols
|
||||||
|
#include <pv/pvDatabase.h>
|
||||||
#include <pv/pvStructureCopy.h>
|
#include <pv/pvStructureCopy.h>
|
||||||
#include <pv/pvPlugin.h>
|
#include <pv/pvPlugin.h>
|
||||||
#include <pv/pvArrayPlugin.h>
|
#include <pv/pvArrayPlugin.h>
|
||||||
#include <pv/pvTimestampPlugin.h>
|
#include <pv/pvTimestampPlugin.h>
|
||||||
#include <pv/pvDeadbandPlugin.h>
|
#include <pv/pvDeadbandPlugin.h>
|
||||||
|
|
||||||
#define epicsExportSharedSymbols
|
|
||||||
|
|
||||||
#include <pv/pvDatabase.h>
|
|
||||||
|
|
||||||
using std::tr1::static_pointer_cast;
|
using std::tr1::static_pointer_cast;
|
||||||
using namespace epics::pvData;
|
using namespace epics::pvData;
|
||||||
using namespace epics::pvCopy;
|
using namespace epics::pvCopy;
|
||||||
|
@ -11,11 +11,9 @@
|
|||||||
#include <epicsGuard.h>
|
#include <epicsGuard.h>
|
||||||
#include <epicsThread.h>
|
#include <epicsThread.h>
|
||||||
|
|
||||||
#include <pv/pvStructureCopy.h>
|
|
||||||
|
|
||||||
#define epicsExportSharedSymbols
|
#define epicsExportSharedSymbols
|
||||||
|
|
||||||
#include <pv/pvDatabase.h>
|
#include <pv/pvDatabase.h>
|
||||||
|
#include <pv/pvStructureCopy.h>
|
||||||
|
|
||||||
|
|
||||||
using std::tr1::static_pointer_cast;
|
using std::tr1::static_pointer_cast;
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
#include <pv/pvAccess.h>
|
#include <pv/pvAccess.h>
|
||||||
#include <pv/status.h>
|
#include <pv/status.h>
|
||||||
#include <pv/serverContext.h>
|
#include <pv/serverContext.h>
|
||||||
#include <pv/pvStructureCopy.h>
|
|
||||||
|
|
||||||
#ifdef channelProviderLocalEpicsExportSharedSymbols
|
#ifdef channelProviderLocalEpicsExportSharedSymbols
|
||||||
# define epicsExportSharedSymbols
|
# define epicsExportSharedSymbols
|
||||||
@ -37,6 +37,7 @@
|
|||||||
|
|
||||||
#include <shareLib.h>
|
#include <shareLib.h>
|
||||||
#include <pv/pvDatabase.h>
|
#include <pv/pvDatabase.h>
|
||||||
|
#include <pv/pvStructureCopy.h>
|
||||||
|
|
||||||
namespace epics { namespace pvDatabase {
|
namespace epics { namespace pvDatabase {
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
#include <pv/pvData.h>
|
#include <pv/pvData.h>
|
||||||
#include <pv/pvTimeStamp.h>
|
#include <pv/pvTimeStamp.h>
|
||||||
#include <pv/rpcService.h>
|
#include <pv/rpcService.h>
|
||||||
#include <pv/pvStructureCopy.h>
|
|
||||||
|
|
||||||
#ifdef pvdatabaseEpicsExportSharedSymbols
|
#ifdef pvdatabaseEpicsExportSharedSymbols
|
||||||
# define epicsExportSharedSymbols
|
# define epicsExportSharedSymbols
|
||||||
@ -25,6 +25,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <shareLib.h>
|
#include <shareLib.h>
|
||||||
|
#include <pv/pvStructureCopy.h>
|
||||||
|
|
||||||
namespace epics { namespace pvDatabase {
|
namespace epics { namespace pvDatabase {
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user