WIN32 DLL; copy build. now for pvDatabase

2019-06-24 09:53:56 -04:00
parent 6969bbd571
commit e949493722
21 changed files with 41 additions and 168 deletions
--- a/src/database/pvDatabase.cpp
+++ b/src/database/pvDatabase.cpp
@ -10,14 +10,20 @@
 */

 #include <epicsGuard.h>
-#define epicsExportSharedSymbols
-#include <pv/pvDatabase.h>
+#include <list>
+#include <map>
+#include <pv/pvData.h>
+#include <pv/pvTimeStamp.h>
+#include <pv/rpcService.h>
 #include <pv/pvStructureCopy.h>
 #include <pv/pvPlugin.h>
 #include <pv/pvArrayPlugin.h>
 #include <pv/pvTimestampPlugin.h>
 #include <pv/pvDeadbandPlugin.h>

+#define epicsExportSharedSymbols
+#include <pv/pvDatabase.h>
+
 using std::tr1::static_pointer_cast;
 using namespace epics::pvData;
 using namespace epics::pvCopy;
--- a/src/database/pvRecord.cpp
+++ b/src/database/pvRecord.cpp
@ -13,6 +13,8 @@
 #include <pv/convert.h>
 #include <pv/pvStructureCopy.h>
 #include <pv/pvData.h>
+#include <list>
+#include <pv/pvTimeStamp.h>

 #define epicsExportSharedSymbols
 #include <pv/pvDatabase.h>
--- a/src/pv/channelProviderLocal.h
+++ b/src/pv/channelProviderLocal.h
@ -11,11 +11,6 @@
 #ifndef CHANNELPROVIDERLOCAL_H
 #define CHANNELPROVIDERLOCAL_H

-#ifdef epicsExportSharedSymbols
-#   define channelProviderLocalEpicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include <string>
 #include <cstring>
 #include <stdexcept>
@ -31,12 +26,6 @@
 #include <pv/pvDatabase.h>
 #include <pv/pvStructureCopy.h>

-
-#ifdef channelProviderLocalEpicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#	undef channelProviderLocalEpicsExportSharedSymbols
-#endif
-
 #include <shareLib.h>

 namespace epics { namespace pvDatabase { 
--- a/src/pv/controlSupport.h
+++ b/src/pv/controlSupport.h
@ -10,20 +10,10 @@
 #ifndef CONTROLSUPPORT_H
 #define CONTROLSUPPORT_H

-#ifdef epicsExportSharedSymbols
-#   define pvdatabaseEpicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include <pv/pvDatabase.h>
 #include <pv/pvSupport.h>
 #include <pv/pvStructureCopy.h>

-#ifdef pvdatabaseEpicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#	undef pvdatabaseEpicsExportSharedSymbols
-#endif
-
 #include <shareLib.h>

 namespace epics { namespace pvDatabase { 
--- a/src/pv/processRecord.h
+++ b/src/pv/processRecord.h
@ -11,22 +11,11 @@
 #ifndef PROCESSRECORD_H
 #define PROCESSRECORD_H

-
-#ifdef epicsExportSharedSymbols
-#   define pvdatabaseEpicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include <map>
 #include <epicsThread.h>
 #include <pv/event.h>
 #include <pv/channelProviderLocal.h>

-#ifdef pvdatabaseEpicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#	undef pvdatabaseEpicsExportSharedSymbols
-#endif
-
 #include <shareLib.h>

 namespace epics { namespace pvDatabase { 
--- a/src/pv/pvDatabase.h
+++ b/src/pv/pvDatabase.h
@ -6,11 +6,6 @@
 #ifndef PVDATABASE_H
 #define PVDATABASE_H

-#ifdef epicsExportSharedSymbols
-#   define pvdatabaseEpicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include <list>
 #include <map>

@ -19,11 +14,6 @@
 #include <pv/rpcService.h>
 #include <pv/pvStructureCopy.h>

-#ifdef pvdatabaseEpicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#	undef pvdatabaseEpicsExportSharedSymbols
-#endif
-
 #include <shareLib.h>

 namespace epics { namespace pvDatabase { 
--- a/src/pv/pvSupport.h
+++ b/src/pv/pvSupport.h
@ -10,11 +10,6 @@
 #ifndef PVSUPPORT_H
 #define PVSUPPORT_H

-#ifdef epicsExportSharedSymbols
-#   define pvdatabaseEpicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include <list>
 #include <map>

@ -23,11 +18,6 @@
 #include <pv/rpcService.h>
 #include <pv/pvStructureCopy.h>

-#ifdef pvdatabaseEpicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#	undef pvdatabaseEpicsExportSharedSymbols
-#endif
-
 #include <shareLib.h>

 namespace epics { namespace pvDatabase { 
--- a/src/pv/removeRecord.h
+++ b/src/pv/removeRecord.h
@ -11,18 +11,8 @@
 #ifndef REMOVERECORD_H
 #define REMOVERECORD_H

-#ifdef epicsExportSharedSymbols
-#   define pvdatabaseEpicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include <pv/channelProviderLocal.h>

-#ifdef pvdatabaseEpicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#	undef pvdatabaseEpicsExportSharedSymbols
-#endif
-
 #include <shareLib.h>

 namespace epics { namespace pvDatabase { 
--- a/src/pv/scalarAlarmSupport.h
+++ b/src/pv/scalarAlarmSupport.h
@ -10,10 +10,6 @@
 #ifndef SCALARALARMSUPPORT_H
 #define SCALARALARMSUPPORT_H

-#ifdef epicsExportSharedSymbols
-#   define pvdatabaseEpicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif

 #include <pv/pvDatabase.h>
 #include <pv/pvSupport.h>
@ -21,11 +17,6 @@
 #include <pv/pvAlarm.h>
 #include <pv/pvStructureCopy.h>

-#ifdef pvdatabaseEpicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#	undef pvdatabaseEpicsExportSharedSymbols
-#endif
-
 #include <shareLib.h>

 namespace epics { namespace pvDatabase { 
--- a/src/pv/traceRecord.h
+++ b/src/pv/traceRecord.h
@ -11,18 +11,8 @@
 #ifndef TRACERECORD_H
 #define TRACERECORD_H

-#ifdef epicsExportSharedSymbols
-#   define pvdatabaseEpicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include <pv/channelProviderLocal.h>

-#ifdef pvdatabaseEpicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#	undef pvdatabaseEpicsExportSharedSymbols
-#endif
-
 #include <shareLib.h>


--- a/src/pvAccess/channelLocal.cpp
+++ b/src/pvAccess/channelLocal.cpp
@ -15,9 +15,10 @@
 #include <epicsThread.h>
 #include <pv/timeStamp.h>
 #include <pv/pvSubArrayCopy.h>
+#include <pv/pvStructureCopy.h>

 #define epicsExportSharedSymbols
-
+#include <pv/pvDatabase.h>
 #include <pv/channelProviderLocal.h>

 using namespace epics::pvData;
--- a/src/pvAccess/channelProviderLocal.cpp
+++ b/src/pvAccess/channelProviderLocal.cpp
@ -1,4 +1,4 @@
-/* channelChannelProviderLocal.cpp */
+/* channelProviderLocal.cpp */
 /**
 * Copyright - See the COPYRIGHT that is included with this distribution.
 * EPICS pvData is distributed subject to a Software License Agreement found
@ -10,12 +10,12 @@
 */

 #include <epicsThread.h>
-
+#include <epicsExport.h>
 #include <pv/serverContext.h>
 #include <pv/syncChannelFind.h>

 #define epicsExportSharedSymbols
-
+#include <pv/pvDatabase.h>
 #include <pv/channelProviderLocal.h>

 using namespace epics::pvData;
--- a/src/pvAccess/monitorFactory.cpp
+++ b/src/pvAccess/monitorFactory.cpp
@ -14,10 +14,12 @@
 #include <epicsGuard.h>
 #include <pv/thread.h>
 #include <pv/bitSetUtil.h>
+#include <pv/pvData.h>
 #include <pv/timeStamp.h>
+#include <pv/pvStructureCopy.h>

 #define epicsExportSharedSymbols
-
+#include <pv/pvDatabase.h>
 #include <pv/channelProviderLocal.h>

 using namespace epics::pvData;
--- a/src/pvAccess/registerChannelProviderLocal.cpp
+++ b/src/pvAccess/registerChannelProviderLocal.cpp
@ -11,29 +11,14 @@

 /* Author: Marty Kraimer */

-#include <cstddef>
-#include <cstdlib>
-#include <cstddef>
-#include <string>
-#include <cstdio>
-#include <memory>
-#include <iostream>
-
-#include <cantProceed.h>
-#include <epicsStdio.h>
-#include <epicsMutex.h>
-#include <epicsEvent.h>
-#include <epicsThread.h>
+#include <epicsExport.h>
 #include <iocsh.h>
-#include <shareLib.h>
-#include <epicsExit.h>
-
 #include <pv/pvAccess.h>
 #include <pv/serverContext.h>

-// this declared epicsExportSharedSymbols
-#include <epicsExport.h>

+#define epicsExportSharedSymbols
+#include <pv/pvDatabase.h>
 #include <pv/channelProviderLocal.h>

 using std::cout;
--- a/src/special/processRecord.cpp
+++ b/src/special/processRecord.cpp
@ -11,10 +11,10 @@
 #include <map>
 #include <epicsThread.h>
 #include <pv/event.h>
-#include <pv/channelProviderLocal.h>
 #include <shareLib.h>

 #define epicsExportSharedSymbols
+#include <pv/pvDatabase.h>
 #include <pv/processRecord.h>

 using std::tr1::static_pointer_cast;
--- a/src/special/processRecordRegister.cpp
+++ b/src/special/processRecordRegister.cpp
@ -11,28 +11,15 @@

 /* Author: Marty Kraimer */

-#include <cstddef>
-#include <cstdlib>
-#include <cstddef>
-#include <string>
-#include <cstdio>
-#include <memory>
-
-#include <cantProceed.h>
-#include <epicsStdio.h>
-#include <epicsMutex.h>
-#include <epicsEvent.h>
-#include <epicsThread.h>
-#include <iocsh.h>
-
-#include <pv/pvIntrospect.h>
-#include <pv/pvData.h>
-#include <pv/pvAccess.h>
-#include <pv/pvDatabase.h>
-
 #include <epicsExport.h>
+#include <iocsh.h>
+#include <pv/pvAccess.h>
+
+#define epicsExportSharedSymbols
+#include <pv/pvDatabase.h>
 #include <pv/processRecord.h>

+
 using namespace epics::pvData;
 using namespace epics::pvAccess;
 using namespace epics::pvDatabase;
--- a/src/special/removeRecord.cpp
+++ b/src/special/removeRecord.cpp
@ -9,9 +9,9 @@
 * @date 2013.04.18
 */
 #include <shareLib.h>
-#include <pv/channelProviderLocal.h>

 #define epicsExportSharedSymbols
+#include <pv/pvDatabase.h>
 #include <pv/removeRecord.h>

 using std::tr1::static_pointer_cast;
--- a/src/special/removeRecordRegister.cpp
+++ b/src/special/removeRecordRegister.cpp
@ -10,27 +10,12 @@


 /* Author: Marty Kraimer */
-
-#include <cstddef>
-#include <cstdlib>
-#include <cstddef>
-#include <string>
-#include <cstdio>
-#include <memory>
-
-#include <cantProceed.h>
-#include <epicsStdio.h>
-#include <epicsMutex.h>
-#include <epicsEvent.h>
-#include <epicsThread.h>
-#include <iocsh.h>
-
-#include <pv/pvIntrospect.h>
-#include <pv/pvData.h>
-#include <pv/pvAccess.h>
-#include <pv/pvDatabase.h>
-
 #include <epicsExport.h>
+#include <iocsh.h>
+#include <pv/pvAccess.h>
+
+#define epicsExportSharedSymbols
+#include <pv/pvDatabase.h>
 #include <pv/removeRecord.h>

 using namespace epics::pvData;
--- a/src/special/traceRecordRegister.cpp
+++ b/src/special/traceRecordRegister.cpp
@ -11,26 +11,12 @@

 /* Author: Marty Kraimer */

-#include <cstddef>
-#include <cstdlib>
-#include <cstddef>
-#include <string>
-#include <cstdio>
-#include <memory>
-
-#include <cantProceed.h>
-#include <epicsStdio.h>
-#include <epicsMutex.h>
-#include <epicsEvent.h>
-#include <epicsThread.h>
-#include <iocsh.h>
-
-#include <pv/pvIntrospect.h>
-#include <pv/pvData.h>
-#include <pv/pvAccess.h>
-#include <pv/pvDatabase.h>
-
 #include <epicsExport.h>
+#include <iocsh.h>
+#include <pv/pvAccess.h>
+
+#define epicsExportSharedSymbols
+#include <pv/pvDatabase.h>
 #include <pv/traceRecord.h>

 using namespace epics::pvData;
--- a/src/support/controlSupport.cpp
+++ b/src/support/controlSupport.cpp
@ -16,7 +16,7 @@


 #define epicsExportSharedSymbols
-
+#include <pv/pvDatabase.h>
 #include <pv/controlSupport.h>

 using std::tr1::static_pointer_cast;
--- a/src/support/scalarAlarmSupport.cpp
+++ b/src/support/scalarAlarmSupport.cpp
@ -18,7 +18,7 @@


 #define epicsExportSharedSymbols
-
+#include <pv/pvDatabase.h>
 #include <pv/scalarAlarmSupport.h>

 using std::tr1::static_pointer_cast;