merge changes from default

arrayPerformance/src/arrayPerformance.h

@@ -17,7 +17,6 @@
 #   undef epicsExportSharedSymbols
 #endif
 
-#include <shareLib.h>
 #include <epicsThread.h>
 #include <pv/standardPVField.h>
 #include <pv/timeStamp.h>

arrayPerformance/src/longArrayGet.h

@@ -17,8 +17,6 @@
 #   undef epicsExportSharedSymbols
 #endif
 
-#include <shareLib.h>
-
 #include <pv/event.h>
 #include <pv/lock.h>
 #include <pv/standardPVField.h>

arrayPerformance/src/longArrayMonitor.h

@@ -16,7 +16,6 @@
 #   undef epicsExportSharedSymbols
 #endif
 
-#include <shareLib.h>
 #include <pv/event.h>
 #include <pv/lock.h>
 #include <pv/standardPVField.h>

arrayPerformance/src/longArrayPut.h

@@ -17,7 +17,6 @@
 #   undef epicsExportSharedSymbols
 #endif
 
-#include <shareLib.h>
 #include <pv/event.h>
 #include <pv/lock.h>
 #include <pv/standardPVField.h>

exampleDatabase/src/Makefile

@@ -14,6 +14,7 @@ exampleDatabase_SRCS += exampleDatabase.cpp
 exampleDatabase_SRCS += exampleMonitorPlugin.cpp
 exampleDatabase_SRCS += exampleDatabaseRegister.cpp
 exampleDatabase_SRCS += exampleMonitorPluginRegister.cpp
+exampleDatabase_LIBS += powerSupply
 exampleDatabase_LIBS += pvDatabase
 exampleDatabase_LIBS += pvAccess
 exampleDatabase_LIBS += pvData

exampleDatabase/src/exampleDatabase.cpp

@@ -27,6 +27,8 @@
 #include <pv/traceRecord.h>
 
 #include <pv/powerSupply.h>
+
+#define epicsExportSharedSymbols
 #include <pv/exampleDatabase.h>
 
 using namespace std;

exampleDatabase/src/exampleDatabase.h

@@ -16,15 +16,15 @@
 #   undef epicsExportSharedSymbols
 #endif
 
-#include <shareLib.h>
 #include <pv/pvDatabase.h>
 
 #ifdef exampledatabaseEpicsExportSharedSymbols
 #   define epicsExportSharedSymbols
 #	undef exampledatabaseEpicsExportSharedSymbols
-#   include <shareLib.h>
 #endif
 
+#include <shareLib.h>
+
 namespace epics { namespace pvDatabase { 
 
 class epicsShareClass  ExampleDatabase{

exampleDatabase/src/exampleDatabaseRegister.cpp

@@ -32,7 +32,6 @@
 #include <pv/pvDatabase.h>
 
 #include <epicsExport.h>
-
 #include <pv/exampleDatabase.h>
 
 using namespace epics::pvData;

exampleDatabase/src/exampleMonitorPlugin.cpp

@@ -11,6 +11,8 @@
 
 #include <pv/convert.h>
 #include <pv/monitorPlugin.h>
+
+#define epicsExportSharedSymbols
 #include <pv/exampleMonitorPlugin.h>
 
 using namespace epics::pvData;

exampleDatabase/src/exampleMonitorPlugin.h

@@ -11,11 +11,22 @@
 #ifndef EXAMPLEMONITORPLUGIN_H
 #define EXAMPLEMONITORPLUGIN_H
 
-#include <shareLib.h>
+#ifdef epicsExportSharedSymbols
+#   define examplemonitorPluginEpicsExportSharedSymbols
+#   undef epicsExportSharedSymbols
+#endif
 
 #include <pv/pvDatabase.h>
 #include <pv/monitorPlugin.h>
 
+#ifdef examplemonitorPluginEpicsExportSharedSymbols
+#   define epicsExportSharedSymbols
+#	undef examplemonitorPluginEpicsExportSharedSymbols
+#endif
+
+#include <shareLib.h>
+
+
 namespace epics { namespace pvDatabase { 
 
 class epicsShareClass  ExampleMonitorPlugin{

exampleDatabase/src/exampleMonitorPluginRegister.cpp

@@ -26,14 +26,15 @@
 #include <epicsThread.h>
 #include <iocsh.h>
 
-#include <epicsExport.h>
-
 #include <pv/pvIntrospect.h>
 #include <pv/pvData.h>
 #include <pv/pvAccess.h>
 #include <pv/pvDatabase.h>
+
+#include <epicsExport.h>
 #include <pv/exampleMonitorPlugin.h>
 
+
 using namespace epics::pvData;
 using namespace epics::pvAccess;
 using namespace epics::pvDatabase;
@@ -61,4 +62,4 @@ std::cout << "exampleMonitorPluginRegister returning\n";
 
 extern "C" {
     epicsExportRegistrar(exampleMonitorPluginRegister);
-}
+}

exampleLink/src/exampleLink.cpp

@@ -9,10 +9,12 @@
  * @date 2013.08.02
  */
 
-#include <pv/exampleLink.h>
 #include <pv/standardPVField.h>
 #include <pv/convert.h>
 
+#define epicsExportSharedSymbols
+#include <pv/exampleLink.h>
+
 using namespace epics::pvData;
 using namespace epics::pvAccess;
 using std::tr1::static_pointer_cast;

exampleLink/src/exampleLink.h

@@ -11,7 +11,10 @@
 #ifndef EXAMPLEPVADOUBLEARRAYGET_H
 #define EXAMPLEPVADOUBLEARRAYGET_H
 
-#include <shareLib.h>
+#ifdef epicsExportSharedSymbols
+#   define exampleLinkEpicsExportSharedSymbols
+#   undef epicsExportSharedSymbols
+#endif
 
 #include <pv/timeStamp.h>
 #include <pv/pvTimeStamp.h>
@@ -22,6 +25,13 @@
 #include <pv/pvAccess.h>
 #include <pv/serverContext.h>
 
+#ifdef exampleLinkEpicsExportSharedSymbols
+#   define epicsExportSharedSymbols
+#	undef exampleLinkEpicsExportSharedSymbols
+#endif
+
+#include <shareLib.h>
+
 namespace epics { namespace pvDatabase { 
 
 

exampleLink/src/exampleLinkRegister.cpp

@@ -27,14 +27,14 @@
 #include <epicsThread.h>
 #include <iocsh.h>
 
-#include <epicsExport.h>
-
 #include <pv/pvIntrospect.h>
 #include <pv/pvData.h>
 #include <pv/standardField.h>
 #include <pv/standardPVField.h>
 #include <pv/pvAccess.h>
 #include <pv/pvDatabase.h>
+
+#include <epicsExport.h>
 #include <pv/exampleLink.h>
 
 using namespace epics::pvData;
@@ -86,4 +86,4 @@ static void exampleLinkRegister(void)
 
 extern "C" {
     epicsExportRegistrar(exampleLinkRegister);
-}
+}

exampleServer/src/exampleServer.cpp

@@ -10,6 +10,8 @@
  */
 
 #include <pv/standardField.h>
+
+#define epicsExportSharedSymbols
 #include <pv/exampleServer.h>
 
 using namespace epics::pvData;

exampleServer/src/exampleServer.h

@@ -11,12 +11,23 @@
 #ifndef EXAMPLECOUNTER_H
 #define EXAMPLECOUNTER_H
 
-#include <shareLib.h>
+#ifdef epicsExportSharedSymbols
+#   define exampleServerEpicsExportSharedSymbols
+#   undef epicsExportSharedSymbols
+#endif
 
 #include <pv/pvDatabase.h>
 #include <pv/timeStamp.h>
 #include <pv/pvTimeStamp.h>
 
+#ifdef exampleServerEpicsExportSharedSymbols
+#   define epicsExportSharedSymbols
+#	undef exampleServerEpicsExportSharedSymbols
+#endif
+
+#include <shareLib.h>
+
+
 namespace epics { namespace exampleServer { 
 
 

exampleServer/src/exampleServerRegister.cpp

@@ -27,13 +27,13 @@
 #include <epicsThread.h>
 #include <iocsh.h>
 
-#include <epicsExport.h>
-
 #include <pv/pvIntrospect.h>
 #include <pv/pvData.h>
 #include <pv/pvAccess.h>
 #include <pv/pvDatabase.h>
 #include <pv/recordList.h>
+
+#include <epicsExport.h>
 #include <pv/exampleServer.h>
 
 using namespace epics::pvData;

pvDatabase.files

@@ -51,4 +51,74 @@ test/src/powerSupply.h
 test/src/powerSupplyRegister.cpp
 test/src/testExampleRecord.cpp
 test/src/testPVCopy.cpp
-test/src/testPVRecord.cpp
+test/src/testPVRecord.cpp
+arrayPerformance/include/pv/arrayPerformance.h
+arrayPerformance/include/pv/longArrayGet.h
+arrayPerformance/include/pv/longArrayMonitor.h
+arrayPerformance/include/pv/longArrayPut.h
+arrayPerformance/src/arrayPerformance.cpp
+arrayPerformance/src/arrayPerformance.h
+arrayPerformance/src/arrayPerformanceMain.cpp
+arrayPerformance/src/longArrayGet.cpp
+arrayPerformance/src/longArrayGet.h
+arrayPerformance/src/longArrayGetMain.cpp
+arrayPerformance/src/longArrayMonitor.cpp
+arrayPerformance/src/longArrayMonitor.h
+arrayPerformance/src/longArrayMonitorMain.cpp
+arrayPerformance/src/longArrayPut.cpp
+arrayPerformance/src/longArrayPut.h
+arrayPerformance/src/longArrayPutMain.cpp
+arrayPerformance/src/vectorPerformanceMain.cpp
+exampleDatabase/include/pv/exampleDatabase.h
+exampleDatabase/include/pv/exampleMonitorPlugin.h
+exampleDatabase/ioc/src/O.darwin-x86/exampleDatabase_registerRecordDeviceDriver.cpp
+exampleDatabase/ioc/src/exampleDatabaseMain.cpp
+exampleDatabase/src/exampleDatabase.cpp
+exampleDatabase/src/exampleDatabase.h
+exampleDatabase/src/exampleDatabaseMain.cpp
+exampleDatabase/src/exampleDatabaseRegister.cpp
+exampleDatabase/src/exampleMonitorPlugin.cpp
+exampleDatabase/src/exampleMonitorPlugin.h
+exampleDatabase/src/exampleMonitorPluginRegister.cpp
+exampleLink/include/pv/exampleLink.h
+exampleLink/ioc/src/O.darwin-x86/exampleLink_registerRecordDeviceDriver.cpp
+exampleLink/ioc/src/exampleLinkMain.cpp
+exampleLink/src/exampleLink.cpp
+exampleLink/src/exampleLink.h
+exampleLink/src/exampleLinkRegister.cpp
+examplePowerSupply/ioc/src/O.darwin-x86/powerSupply_registerRecordDeviceDriver.cpp
+examplePowerSupply/ioc/src/powerSupplyMain.cpp
+examplePowerSupply/src/powerSupplyMain.cpp
+exampleServer/include/pv/exampleServer.h
+exampleServer/ioc/src/O.darwin-x86/exampleServer_registerRecordDeviceDriver.cpp
+exampleServer/ioc/src/exampleServerMain.cpp
+exampleServer/src/exampleServer.cpp
+exampleServer/src/exampleServer.h
+exampleServer/src/exampleServerMain.cpp
+exampleServer/src/exampleServerRegister.cpp
+include/pv/channelProviderLocal.h
+include/pv/pvCopyMonitor.h
+include/pv/pvDatabase.h
+include/pv/recordList.h
+include/pv/traceRecord.h
+src/database/pvDatabase.cpp
+src/database/pvDatabase.h
+src/database/pvRecord.cpp
+src/pvAccess/channelLocal.cpp
+src/pvAccess/channelProviderLocal.cpp
+src/pvAccess/channelProviderLocal.h
+src/pvAccess/monitorFactory.cpp
+src/pvAccess/pvCopyMonitor.cpp
+src/pvAccess/pvCopyMonitor.h
+src/pvAccess/registerChannelProviderLocal.cpp
+src/special/recordList.cpp
+src/special/recordList.h
+src/special/traceRecord.cpp
+src/special/traceRecord.h
+test/include/pv/powerSupply.h
+test/src/powerSupply.cpp
+test/src/powerSupply.h
+test/src/powerSupplyRegister.cpp
+test/src/testExampleRecord.cpp
+test/src/testPVCopy.cpp
+test/src/testPVRecord.cpp

src/database/pvDatabase.h

@@ -27,9 +27,10 @@
 #ifdef pvdatabaseEpicsExportSharedSymbols
 #   define epicsExportSharedSymbols
 #	undef pvdatabaseEpicsExportSharedSymbols
-#   include <shareLib.h>
 #endif
 
+#include <shareLib.h>
+
 
 namespace epics { namespace pvDatabase { 
 

src/pvAccess/channelProviderLocal.h

@@ -22,8 +22,6 @@
 #include <memory>
 #include <set>
 
-#include <shareLib.h>
-
 #include <pv/lock.h>
 #include <pv/pvType.h>
 #include <pv/pvData.h>
@@ -37,6 +35,8 @@
 #	undef channelProviderLocalEpicsExportSharedSymbols
 #endif
 
+#include <shareLib.h>
+
 #include <pv/pvDatabase.h>
 
 

src/pvAccess/pvCopyMonitor.h

@@ -21,8 +21,6 @@
 #include <memory>
 #include <list>
 
-#include <shareLib.h>
-
 #include <pv/monitorPlugin.h>
 #include <pv/pvCopy.h>
 #include <pv/pvAccess.h>
@@ -32,6 +30,8 @@
 #	undef pvCopyMonitorEpicsExportSharedSymbols
 #endif
 
+#include <shareLib.h>
+
 #include <pv/pvDatabase.h>
 
 namespace epics { namespace pvDatabase { 

src/pvAccess/registerChannelProviderLocal.cpp

@@ -27,12 +27,12 @@
 #include <iocsh.h>
 #include <shareLib.h>
 
-#include <epicsExport.h>
-
 #include <pv/pvAccess.h>
 #include <pv/serverContext.h>
 
-#define epicsExportSharedSymbols
+// this declared epicsExportSharedSymbols
+#include <epicsExport.h>
+
 #include <pv/channelProviderLocal.h>
 
 using std::cout;

test/src/powerSupply.cpp

@@ -9,10 +9,12 @@
  * @date 2013.04.02
  */
 
-#include "powerSupply.h"
 #include <pv/standardField.h>
 #include <pv/standardPVField.h>
 
+#define epicsExportSharedSymbols
+#include "powerSupply.h"
+
 using namespace epics::pvData;
 using std::string;
 using std::cout;

test/src/powerSupply.h

@@ -11,13 +11,25 @@
 #ifndef POWERSUPPLY_H
 #define POWERSUPPLY_H
 
-#include <shareLib.h>
 
-#include <pv/pvDatabase.h>
+#ifdef epicsExportSharedSymbols
+#   define powerSupplyEpicsExportSharedSymbols
+#   undef epicsExportSharedSymbols
+#endif
+
 #include <pv/timeStamp.h>
 #include <pv/alarm.h>
 #include <pv/pvTimeStamp.h>
 #include <pv/pvAlarm.h>
+#include <pv/pvDatabase.h>
+
+#ifdef powerSupplyEpicsExportSharedSymbols
+#   define epicsExportSharedSymbols
+#	undef powerSupplyEpicsExportSharedSymbols
+#endif
+
+#include <shareLib.h>
+
 
 namespace epics { namespace pvDatabase { 
 
@@ -26,7 +38,7 @@ epicsShareExtern epics::pvData::PVStructurePtr createPowerSupply();
 class PowerSupply;
 typedef std::tr1::shared_ptr<PowerSupply> PowerSupplyPtr;
 
-class PowerSupply :
+class epicsShareClass PowerSupply :
     public PVRecord
 {
 public:

test/src/powerSupplyRegister.cpp

@@ -27,12 +27,12 @@
 #include <epicsThread.h>
 #include <iocsh.h>
 
-#include <epicsExport.h>
-
 #include <pv/pvIntrospect.h>
 #include <pv/pvData.h>
 #include <pv/pvAccess.h>
 #include <pv/pvDatabase.h>
+
+#include <epicsExport.h>
 #include <pv/powerSupply.h>
 
 using namespace epics::pvData;
@@ -69,4 +69,4 @@ static void powerSupplyRegister(void)
 
 extern "C" {
     epicsExportRegistrar(powerSupplyRegister);
-}
+}

test/src/testExampleRecord.cpp

@@ -23,14 +23,14 @@
 #include <epicsEvent.h>
 #include <epicsThread.h>
 
-#include <epicsExport.h>
-
 #include <pv/standardField.h>
 #include <pv/standardPVField.h>
 #include <pv/pvData.h>
 #include <pv/pvAccess.h>
 #include "powerSupply.h"
 
+#include <epicsExport.h>
+
 using namespace std;
 using std::tr1::static_pointer_cast;
 using namespace epics::pvData;