still more work on includes

src/special/addRecord.cpp

@@ -25,10 +25,10 @@
 #include <pv/pvAccess.h>
 #include <pv/status.h>
 #include <pv/serverContext.h>
-#include "pv/pvStructureCopy.h"
-#include "pv/pvDatabase.h"
 
 #define epicsExportSharedSymbols
+#include "pv/pvStructureCopy.h"
+#include "pv/pvDatabase.h"
 #include "pv/addRecord.h"
 
 using std::tr1::static_pointer_cast;

src/special/addRecordRegister.cpp

@@ -17,11 +17,11 @@
 #include <pv/pvTimeStamp.h>
 #include <pv/alarm.h>
 #include <pv/pvAlarm.h>
-#include <pv/pvDatabase.h>
 
 // The following must be the last include for code pvDatabase uses
 #include <epicsExport.h>
 #define epicsExportSharedSymbols
+#include "pv/pvDatabase.h"
 #include "pv/addRecord.h"
 
 using namespace epics::pvData;

src/special/processRecord.cpp

@@ -27,10 +27,10 @@
 #include <pv/pvAccess.h>
 #include <pv/status.h>
 #include <pv/serverContext.h>
-#include "pv/pvStructureCopy.h"
-#include "pv/pvDatabase.h"
 
 #define epicsExportSharedSymbols
+#include "pv/pvStructureCopy.h"
+#include "pv/pvDatabase.h"
 #include "pv/processRecord.h"
 
 using std::tr1::static_pointer_cast;

src/special/processRecordRegister.cpp

@@ -17,11 +17,11 @@
 #include <pv/pvTimeStamp.h>
 #include <pv/alarm.h>
 #include <pv/pvAlarm.h>
-#include <pv/pvDatabase.h>
 
 // The following must be the last include for code pvDatabase uses
 #include <epicsExport.h>
 #define epicsExportSharedSymbols
+#include "pv/pvDatabase.h"
 #include "pv/processRecord.h"
 
 

src/special/pvdbcrAddRecordRegister.cpp

@@ -14,12 +14,11 @@
 #include <pv/pvTimeStamp.h>
 #include <pv/alarm.h>
 #include <pv/pvAlarm.h>
-#include <pv/pvDatabase.h>
 
 // The following must be the last include for code exampleLink uses
 #include <epicsExport.h>
 #define epicsExportSharedSymbols
-
+#include "pv/pvDatabase.h"
 using std::tr1::static_pointer_cast;
 using namespace epics::pvData;
 using namespace epics::pvAccess;

src/special/pvdbcrProcessRecordRegister.cpp

@@ -8,6 +8,7 @@
  * @date 2021.03.12
  */
 #include <epicsThread.h>
+#include <epicsGuard.h>
 #include <pv/event.h>
 #include <pv/lock.h>
 #include <iocsh.h>
@@ -17,12 +18,10 @@
 #include <pv/pvTimeStamp.h>
 #include <pv/alarm.h>
 #include <pv/pvAlarm.h>
-#include <pv/pvDatabase.h>
 
-// The following must be the last include for code exampleLink uses
 #include <epicsExport.h>
 #define epicsExportSharedSymbols
-
+#include "pv/pvDatabase.h"
 using namespace epics::pvData;
 using namespace epics::pvAccess;
 using namespace epics::pvDatabase;

src/special/pvdbcrRemoveRecordRegister.cpp

@@ -14,12 +14,10 @@
 #include <pv/pvTimeStamp.h>
 #include <pv/alarm.h>
 #include <pv/pvAlarm.h>
-#include <pv/pvDatabase.h>
 
-// The following must be the last include for code exampleLink uses
 #include <epicsExport.h>
 #define epicsExportSharedSymbols
-
+#include "pv/pvDatabase.h"
 using namespace epics::pvData;
 using namespace epics::pvAccess;
 using namespace epics::pvDatabase;

src/special/pvdbcrScalarArrayRegister.cpp

@@ -12,11 +12,11 @@
 /* Author: Marty Kraimer */
 #include <iocsh.h>
 #include <pv/standardField.h>
-#include <pv/pvDatabase.h>
+
-// The following must be the last include for code exampleLink uses
+// The following must be the last include for code pvDatabase implements
 #include <epicsExport.h>
 #define epicsExportSharedSymbols
-
+#include "pv/pvDatabase.h"
 using namespace epics::pvData;
 using namespace epics::pvDatabase;
 using namespace std;

src/special/pvdbcrScalarRegister.cpp

@@ -9,11 +9,10 @@
  */
 #include <iocsh.h>
 #include <pv/standardField.h>
-#include <pv/pvDatabase.h>
+// The following must be the last include for code pvDatabase implements
-// The following must be the last include for code exampleLink uses
 #include <epicsExport.h>
 #define epicsExportSharedSymbols
-
+#include "pv/pvDatabase.h"
 using namespace epics::pvData;
 using namespace epics::pvDatabase;
 using namespace std;

src/special/pvdbcrTraceRecordRegister.cpp

@@ -14,11 +14,11 @@
 #include <pv/pvTimeStamp.h>
 #include <pv/alarm.h>
 #include <pv/pvAlarm.h>
-#include <pv/pvDatabase.h>
 
-// The following must be the last include for code exampleLink uses
+// The following must be the last include
 #include <epicsExport.h>
 #define epicsExportSharedSymbols
+#include "pv/pvDatabase.h"
 
 using namespace epics::pvData;
 using namespace epics::pvAccess;

src/special/removeRecord.cpp

@@ -24,10 +24,10 @@
 #include <pv/pvAccess.h>
 #include <pv/status.h>
 #include <pv/serverContext.h>
-#include "pv/pvStructureCopy.h"
-#include "pv/pvDatabase.h"
 
 #define epicsExportSharedSymbols
+#include "pv/pvStructureCopy.h"
+#include "pv/pvDatabase.h"
 #include "pv/removeRecord.h"
 
 using std::tr1::static_pointer_cast;

src/special/removeRecordRegister.cpp

@@ -18,11 +18,11 @@
 #include <pv/pvTimeStamp.h>
 #include <pv/alarm.h>
 #include <pv/pvAlarm.h>
-#include <pv/pvDatabase.h>
 
 // The following must be the last include for code pvDatabase uses
 #include <epicsExport.h>
 #define epicsExportSharedSymbols
+#include "pv/pvDatabase.h"
 #include "pv/removeRecord.h"
 
 using namespace epics::pvData;

src/special/traceRecord.cpp

@@ -24,10 +24,10 @@
 #include <pv/pvAccess.h>
 #include <pv/status.h>
 #include <pv/serverContext.h>
-#include "pv/pvStructureCopy.h"
-#include "pv/channelProviderLocal.h"
 
 #define epicsExportSharedSymbols
+#include "pv/pvStructureCopy.h"
+#include "pv/channelProviderLocal.h"
 #include "pv/traceRecord.h"
 
 using std::tr1::static_pointer_cast;