From 78a8f26dd001437d3b2b1e9e98a34ef6899a6789 Mon Sep 17 00:00:00 2001 From: Matej Sekoranja Date: Wed, 16 Sep 2015 21:11:05 +0200 Subject: [PATCH] win support port --- src/pvaClient.cpp | 6 ++++-- src/pvaClientChannel.cpp | 5 +++-- src/pvaClientGet.cpp | 4 +++- src/pvaClientGetData.cpp | 7 ++++--- src/pvaClientMonitor.cpp | 6 ++++-- src/pvaClientMonitorData.cpp | 7 ++++--- src/pvaClientMultiChannel.cpp | 4 +++- src/pvaClientMultiChannel.h | 11 +++++++++-- src/pvaClientMultiGetDouble.cpp | 6 ++++-- src/pvaClientMultiMonitorDouble.cpp | 6 ++++-- src/pvaClientMultiPutDouble.cpp | 6 ++++-- src/pvaClientNTMultiData.cpp | 6 ++++-- src/pvaClientNTMultiGet.cpp | 6 ++++-- src/pvaClientNTMultiMonitor.cpp | 6 ++++-- src/pvaClientNTMultiPut.cpp | 6 ++++-- src/pvaClientProcess.cpp | 4 +++- src/pvaClientPut.cpp | 4 +++- src/pvaClientPutData.cpp | 7 ++++--- src/pvaClientPutGet.cpp | 3 ++- 19 files changed, 74 insertions(+), 36 deletions(-) diff --git a/src/pvaClient.cpp b/src/pvaClient.cpp index a64c514..3e9c794 100644 --- a/src/pvaClient.cpp +++ b/src/pvaClient.cpp @@ -9,13 +9,15 @@ * @date 2015.02 */ -#define epicsExportSharedSymbols #include -#include #include #include #include +#define epicsExportSharedSymbols + +#include + using std::tr1::static_pointer_cast; using namespace epics::pvData; using namespace epics::pvAccess; diff --git a/src/pvaClientChannel.cpp b/src/pvaClientChannel.cpp index 3350fc3..4224380 100644 --- a/src/pvaClientChannel.cpp +++ b/src/pvaClientChannel.cpp @@ -8,14 +8,15 @@ * @author mrk * @date 2015.02 */ -#define epicsExportSharedSymbols #include #include #include -#include #include +#define epicsExportSharedSymbols + +#include using std::tr1::static_pointer_cast; using namespace epics::pvData; diff --git a/src/pvaClientGet.cpp b/src/pvaClientGet.cpp index 24ec4ea..ce1a945 100644 --- a/src/pvaClientGet.cpp +++ b/src/pvaClientGet.cpp @@ -8,9 +8,11 @@ * @author mrk * @date 2015.02 */ -#define epicsExportSharedSymbols #include + +#define epicsExportSharedSymbols + #include using std::tr1::static_pointer_cast; diff --git a/src/pvaClientGetData.cpp b/src/pvaClientGetData.cpp index 507e38e..4eb84e6 100644 --- a/src/pvaClientGetData.cpp +++ b/src/pvaClientGetData.cpp @@ -8,15 +8,16 @@ * @author mrk * @date 2015.02 */ -#define epicsExportSharedSymbols #include - #include -#include + #include #include +#define epicsExportSharedSymbols + +#include using std::tr1::static_pointer_cast; using namespace epics::pvData; diff --git a/src/pvaClientMonitor.cpp b/src/pvaClientMonitor.cpp index 5fd163b..56a8d11 100644 --- a/src/pvaClientMonitor.cpp +++ b/src/pvaClientMonitor.cpp @@ -8,13 +8,15 @@ * @author mrk * @date 2015.03 */ -#define epicsExportSharedSymbols #include #include -#include #include +#define epicsExportSharedSymbols + +#include + using std::tr1::static_pointer_cast; using namespace epics::pvData; using namespace epics::pvAccess; diff --git a/src/pvaClientMonitorData.cpp b/src/pvaClientMonitorData.cpp index c6d5775..03b8bce 100644 --- a/src/pvaClientMonitorData.cpp +++ b/src/pvaClientMonitorData.cpp @@ -8,15 +8,16 @@ * @author mrk * @date 2015.02 */ -#define epicsExportSharedSymbols #include - #include -#include + #include #include +#define epicsExportSharedSymbols + +#include using std::tr1::static_pointer_cast; using namespace epics::pvData; diff --git a/src/pvaClientMultiChannel.cpp b/src/pvaClientMultiChannel.cpp index 5db125c..b6da0e0 100644 --- a/src/pvaClientMultiChannel.cpp +++ b/src/pvaClientMultiChannel.cpp @@ -8,11 +8,13 @@ * @author mrk * @date 2015.02 */ -#define epicsExportSharedSymbols #include #include #include + +#define epicsExportSharedSymbols + #include diff --git a/src/pvaClientMultiChannel.h b/src/pvaClientMultiChannel.h index a250490..a815970 100644 --- a/src/pvaClientMultiChannel.h +++ b/src/pvaClientMultiChannel.h @@ -12,14 +12,21 @@ #define PVACLIENTMULTICHANNEL_H #ifdef epicsExportSharedSymbols -# define pvaClientEpicsExportSharedSymbols +# define pvaClientMultiChannelEpicsExportSharedSymbols # undef epicsExportSharedSymbols #endif -#include #include #include +#ifdef pvaClientMultiChannelEpicsExportSharedSymbols +# define epicsExportSharedSymbols +# undef pvaClientMultiChannelEpicsExportSharedSymbols +#endif + + +#include + namespace epics { namespace pvaClient { diff --git a/src/pvaClientMultiGetDouble.cpp b/src/pvaClientMultiGetDouble.cpp index 31d53d6..68c6e96 100644 --- a/src/pvaClientMultiGetDouble.cpp +++ b/src/pvaClientMultiGetDouble.cpp @@ -9,12 +9,14 @@ * @date 2015.03 */ -#define epicsExportSharedSymbols -#include #include #include #include +#define epicsExportSharedSymbols + +#include + using std::tr1::static_pointer_cast; using namespace epics::pvData; using namespace epics::pvAccess; diff --git a/src/pvaClientMultiMonitorDouble.cpp b/src/pvaClientMultiMonitorDouble.cpp index e894e38..6ef70b3 100644 --- a/src/pvaClientMultiMonitorDouble.cpp +++ b/src/pvaClientMultiMonitorDouble.cpp @@ -9,13 +9,15 @@ * @date 2015.03 */ -#define epicsExportSharedSymbols #include -#include #include #include #include +#define epicsExportSharedSymbols + +#include + using std::tr1::static_pointer_cast; using namespace epics::pvData; using namespace epics::pvAccess; diff --git a/src/pvaClientMultiPutDouble.cpp b/src/pvaClientMultiPutDouble.cpp index e82bed7..29a1758 100644 --- a/src/pvaClientMultiPutDouble.cpp +++ b/src/pvaClientMultiPutDouble.cpp @@ -9,12 +9,14 @@ * @date 2015.03 */ -#define epicsExportSharedSymbols -#include #include #include #include +#define epicsExportSharedSymbols + +#include + using std::tr1::static_pointer_cast; using namespace epics::pvData; using namespace epics::pvAccess; diff --git a/src/pvaClientNTMultiData.cpp b/src/pvaClientNTMultiData.cpp index 13c45e5..be67f14 100644 --- a/src/pvaClientNTMultiData.cpp +++ b/src/pvaClientNTMultiData.cpp @@ -9,10 +9,12 @@ * @date 2015.03 */ -#define epicsExportSharedSymbols -#include #include +#define epicsExportSharedSymbols + +#include + using std::tr1::static_pointer_cast; using namespace epics::pvData; using namespace epics::pvAccess; diff --git a/src/pvaClientNTMultiGet.cpp b/src/pvaClientNTMultiGet.cpp index 61d55c2..4d13c75 100644 --- a/src/pvaClientNTMultiGet.cpp +++ b/src/pvaClientNTMultiGet.cpp @@ -9,12 +9,14 @@ * @date 2015.03 */ -#define epicsExportSharedSymbols -#include #include #include #include +#define epicsExportSharedSymbols + +#include + using std::tr1::static_pointer_cast; using namespace epics::pvData; using namespace epics::pvAccess; diff --git a/src/pvaClientNTMultiMonitor.cpp b/src/pvaClientNTMultiMonitor.cpp index 9e2052e..0de4d2b 100644 --- a/src/pvaClientNTMultiMonitor.cpp +++ b/src/pvaClientNTMultiMonitor.cpp @@ -9,13 +9,15 @@ * @date 2015.03 */ -#define epicsExportSharedSymbols #include -#include #include #include #include +#define epicsExportSharedSymbols + +#include + using std::tr1::static_pointer_cast; using namespace epics::pvData; using namespace epics::pvAccess; diff --git a/src/pvaClientNTMultiPut.cpp b/src/pvaClientNTMultiPut.cpp index 0fc6314..66f086a 100644 --- a/src/pvaClientNTMultiPut.cpp +++ b/src/pvaClientNTMultiPut.cpp @@ -9,12 +9,14 @@ * @date 2015.03 */ -#define epicsExportSharedSymbols -#include #include #include #include +#define epicsExportSharedSymbols + +#include + using std::tr1::static_pointer_cast; using namespace epics::pvData; using namespace epics::pvAccess; diff --git a/src/pvaClientProcess.cpp b/src/pvaClientProcess.cpp index eaa516e..fefda9f 100644 --- a/src/pvaClientProcess.cpp +++ b/src/pvaClientProcess.cpp @@ -8,9 +8,11 @@ * @author mrk * @date 2015.02 */ -#define epicsExportSharedSymbols #include + +#define epicsExportSharedSymbols + #include using std::tr1::static_pointer_cast; diff --git a/src/pvaClientPut.cpp b/src/pvaClientPut.cpp index 8362d11..aa061e4 100644 --- a/src/pvaClientPut.cpp +++ b/src/pvaClientPut.cpp @@ -8,9 +8,11 @@ * @author mrk * @date 2015.02 */ -#define epicsExportSharedSymbols #include + +#define epicsExportSharedSymbols + #include using std::tr1::static_pointer_cast; diff --git a/src/pvaClientPutData.cpp b/src/pvaClientPutData.cpp index c3f2d54..04a9afd 100644 --- a/src/pvaClientPutData.cpp +++ b/src/pvaClientPutData.cpp @@ -8,15 +8,16 @@ * @author mrk * @date 2015.02 */ -#define epicsExportSharedSymbols #include - #include -#include + #include #include +#define epicsExportSharedSymbols + +#include using std::tr1::static_pointer_cast; using namespace epics::pvData; diff --git a/src/pvaClientPutGet.cpp b/src/pvaClientPutGet.cpp index 2a9a7e5..07d4574 100644 --- a/src/pvaClientPutGet.cpp +++ b/src/pvaClientPutGet.cpp @@ -8,9 +8,10 @@ * @author mrk * @date 2015.02 */ +#include + #define epicsExportSharedSymbols -#include #include using std::tr1::static_pointer_cast;