From 605d4e99b92376cc3bb4a5502adcc9b40a4bb6be Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Mon, 11 Apr 2016 15:24:46 -0500 Subject: [PATCH] Remove remaining 'undef epicsExportSharedSymbols' stuff --- src/copy/createRequest.cpp | 2 ++ src/copy/pvCopy.cpp | 2 ++ src/factory/Convert.cpp | 2 ++ src/factory/FieldCreateFactory.cpp | 2 ++ src/factory/PVDataCreateFactory.cpp | 2 ++ src/factory/PVField.cpp | 2 ++ src/factory/StandardField.cpp | 2 ++ src/factory/StandardPVField.cpp | 2 ++ src/misc/bitSet.cpp | 3 ++- src/misc/byteBuffer.cpp | 3 +++ src/misc/pv/byteBuffer.h | 12 +----------- src/misc/pv/event.h | 12 +----------- src/misc/pv/lock.h | 12 +----------- src/misc/pv/thread.h | 12 +----------- src/misc/pv/typeCast.h | 12 +----------- src/misc/requester.cpp | 2 ++ src/misc/serializeHelper.cpp | 2 ++ src/misc/timeFunction.cpp | 2 ++ src/misc/typeCast.cpp | 2 ++ src/property/alarm.cpp | 2 ++ src/property/pv/timeStamp.h | 12 +----------- 21 files changed, 37 insertions(+), 67 deletions(-) diff --git a/src/copy/createRequest.cpp b/src/copy/createRequest.cpp index 80e4f63..7e125a3 100644 --- a/src/copy/createRequest.cpp +++ b/src/copy/createRequest.cpp @@ -7,6 +7,8 @@ #include #include +#include + #define epicsExportSharedSymbols #include diff --git a/src/copy/pvCopy.cpp b/src/copy/pvCopy.cpp index c605dd8..8f6b4fb 100644 --- a/src/copy/pvCopy.cpp +++ b/src/copy/pvCopy.cpp @@ -13,6 +13,8 @@ #include #include +#include + #define epicsExportSharedSymbols #include diff --git a/src/factory/Convert.cpp b/src/factory/Convert.cpp index 649ec1a..cd702f4 100644 --- a/src/factory/Convert.cpp +++ b/src/factory/Convert.cpp @@ -13,6 +13,8 @@ #include #include +#include + #define epicsExportSharedSymbols #include #include diff --git a/src/factory/FieldCreateFactory.cpp b/src/factory/FieldCreateFactory.cpp index 374fdd3..6d5581d 100644 --- a/src/factory/FieldCreateFactory.cpp +++ b/src/factory/FieldCreateFactory.cpp @@ -19,6 +19,8 @@ #include #include +#include + #define epicsExportSharedSymbols #include #include diff --git a/src/factory/PVDataCreateFactory.cpp b/src/factory/PVDataCreateFactory.cpp index 0a9e4c0..b328db3 100644 --- a/src/factory/PVDataCreateFactory.cpp +++ b/src/factory/PVDataCreateFactory.cpp @@ -17,6 +17,8 @@ #include #include +#include + #define epicsExportSharedSymbols #include #include diff --git a/src/factory/PVField.cpp b/src/factory/PVField.cpp index bb4ff1e..4a91a89 100644 --- a/src/factory/PVField.cpp +++ b/src/factory/PVField.cpp @@ -12,6 +12,8 @@ #include #include +#include + #define epicsExportSharedSymbols #include #include diff --git a/src/factory/StandardField.cpp b/src/factory/StandardField.cpp index 9a359b2..f0926e9 100644 --- a/src/factory/StandardField.cpp +++ b/src/factory/StandardField.cpp @@ -11,6 +11,8 @@ #include #include +#include + #define epicsExportSharedSymbols #include #include diff --git a/src/factory/StandardPVField.cpp b/src/factory/StandardPVField.cpp index d26917c..22d34ca 100644 --- a/src/factory/StandardPVField.cpp +++ b/src/factory/StandardPVField.cpp @@ -10,6 +10,8 @@ #include #include +#include + #define epicsExportSharedSymbols #include #include diff --git a/src/misc/bitSet.cpp b/src/misc/bitSet.cpp index eea3edb..daaec05 100644 --- a/src/misc/bitSet.cpp +++ b/src/misc/bitSet.cpp @@ -10,9 +10,10 @@ #include #include #include - #include +#include + #define epicsExportSharedSymbols #include #include diff --git a/src/misc/byteBuffer.cpp b/src/misc/byteBuffer.cpp index f65a647..ebde96c 100644 --- a/src/misc/byteBuffer.cpp +++ b/src/misc/byteBuffer.cpp @@ -6,3 +6,6 @@ /** * @author mse */ + +#define epicsExportSharedSymbols +#include diff --git a/src/misc/pv/byteBuffer.h b/src/misc/pv/byteBuffer.h index f20d475..259c063 100644 --- a/src/misc/pv/byteBuffer.h +++ b/src/misc/pv/byteBuffer.h @@ -14,22 +14,12 @@ #include #include -#ifdef epicsExportSharedSymbols -#define byteBufferepicsExportSharedSymbols -#undef epicsExportSharedSymbols -#endif - #include - -#ifdef byteBufferepicsExportSharedSymbols -#define epicsExportSharedSymbols -#undef byteBufferepicsExportSharedSymbols -#endif +#include #include #include -#include namespace epics { namespace pvData { diff --git a/src/misc/pv/event.h b/src/misc/pv/event.h index ab2327c..ade00a8 100644 --- a/src/misc/pv/event.h +++ b/src/misc/pv/event.h @@ -13,22 +13,12 @@ #include #include -#ifdef epicsExportSharedSymbols -#define eventepicsExportSharedSymbols -#undef epicsExportSharedSymbols -#endif - #include - -#ifdef eventepicsExportSharedSymbols -#define epicsExportSharedSymbols -#undef eventepicsExportSharedSymbols -#endif +#include #include #include -#include namespace epics { namespace pvData { diff --git a/src/misc/pv/lock.h b/src/misc/pv/lock.h index dc4d7ee..0ef2d2c 100644 --- a/src/misc/pv/lock.h +++ b/src/misc/pv/lock.h @@ -12,21 +12,11 @@ #include -#ifdef epicsExportSharedSymbols -#define lockepicsExportSharedSymbols -#undef epicsExportSharedSymbols -#endif - #include - -#ifdef lockepicsExportSharedSymbols -#define epicsExportSharedSymbols -#undef lockepicsExportSharedSymbols -#endif +#include #include -#include /* This is based on item 14 of * Effective C++, Third Edition, Scott Meyers diff --git a/src/misc/pv/thread.h b/src/misc/pv/thread.h index 0f2dc94..4a67456 100644 --- a/src/misc/pv/thread.h +++ b/src/misc/pv/thread.h @@ -17,22 +17,12 @@ #include #endif -#ifdef epicsExportSharedSymbols -#define threadepicsExportSharedSymbols -#undef epicsExportSharedSymbols -#endif - #include - -#ifdef threadepicsExportSharedSymbols -#define epicsExportSharedSymbols -#undef threadepicsExportSharedSymbols -#endif +#include #include #include -#include namespace epics { namespace pvData { diff --git a/src/misc/pv/typeCast.h b/src/misc/pv/typeCast.h index 5a85316..86c2690 100644 --- a/src/misc/pv/typeCast.h +++ b/src/misc/pv/typeCast.h @@ -10,23 +10,13 @@ #include #include -#ifdef epicsExportSharedSymbols -#define typeCastepicsExportSharedSymbols -#undef epicsExportSharedSymbols -#endif - #include - -#ifdef typeCastepicsExportSharedSymbols -#define epicsExportSharedSymbols -#undef typeCastepicsExportSharedSymbols -#endif +#include #include #include #include -#include namespace epics { namespace pvData { diff --git a/src/misc/requester.cpp b/src/misc/requester.cpp index 58de21d..aace551 100644 --- a/src/misc/requester.cpp +++ b/src/misc/requester.cpp @@ -10,6 +10,8 @@ #include #include +#include + #define epicsExportSharedSymbols #include #include diff --git a/src/misc/serializeHelper.cpp b/src/misc/serializeHelper.cpp index a3994ee..b8df144 100644 --- a/src/misc/serializeHelper.cpp +++ b/src/misc/serializeHelper.cpp @@ -12,6 +12,8 @@ #include +#include + #define epicsExportSharedSymbols #include #include diff --git a/src/misc/timeFunction.cpp b/src/misc/timeFunction.cpp index d821429..c26d3c3 100644 --- a/src/misc/timeFunction.cpp +++ b/src/misc/timeFunction.cpp @@ -13,6 +13,8 @@ #include #include +#include + #define epicsExportSharedSymbols #include #include diff --git a/src/misc/typeCast.cpp b/src/misc/typeCast.cpp index 14587e7..8d768f0 100644 --- a/src/misc/typeCast.cpp +++ b/src/misc/typeCast.cpp @@ -7,6 +7,8 @@ #include #include +#include + #define epicsExportSharedSymbols #include "pv/typeCast.h" diff --git a/src/property/alarm.cpp b/src/property/alarm.cpp index 56f31d3..352a0ed 100644 --- a/src/property/alarm.cpp +++ b/src/property/alarm.cpp @@ -10,6 +10,8 @@ #include #include +#include + #define epicsExportSharedSymbols #include #include diff --git a/src/property/pv/timeStamp.h b/src/property/pv/timeStamp.h index 2f018f9..bbd8bd6 100644 --- a/src/property/pv/timeStamp.h +++ b/src/property/pv/timeStamp.h @@ -12,21 +12,11 @@ #include -#ifdef epicsExportSharedSymbols -#define timeStampepicsExportSharedSymbols -#undef epicsExportSharedSymbols -#endif - #include - -#ifdef timeStampepicsExportSharedSymbols -#define epicsExportSharedSymbols -#undef timeStampepicsExportSharedSymbols -#endif +#include #include -#include namespace epics { namespace pvData {