From 7e0bc0c45a34fee02fd3dc5acb0f7a37a7b1463d Mon Sep 17 00:00:00 2001
From: mrkraimer <mrkraimer@comcast.net>
Date: Sat, 29 Sep 2018 12:18:29 -0400
Subject: [PATCH] another attempt to fix windows build

---
 src/copy/pv/pvStructureCopy.h |  5 ++---
 src/copy/pvCopy.cpp           | 11 +----------
 src/database/pvDatabase.cpp   |  7 +++++++
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/copy/pv/pvStructureCopy.h b/src/copy/pv/pvStructureCopy.h
index 3305660..17376cd 100644
--- a/src/copy/pv/pvStructureCopy.h
+++ b/src/copy/pv/pvStructureCopy.h
@@ -12,12 +12,11 @@
 #include <string>
 #include <stdexcept>
 #include <memory>
-
-#include <shareLib.h>
-
 #include <pv/pvData.h>
 #include <pv/bitSet.h>
 
+#include <shareLib.h>
+
 namespace epics { namespace pvCopy{ 
 
 class PVCopyTraverseMasterCallback;
diff --git a/src/copy/pvCopy.cpp b/src/copy/pvCopy.cpp
index aae9171..4988517 100644
--- a/src/copy/pvCopy.cpp
+++ b/src/copy/pvCopy.cpp
@@ -18,9 +18,7 @@
 
 #define epicsExportSharedSymbols
 #include <pv/pvStructureCopy.h>
-#include <pv/pvArrayPlugin.h>
-#include <pv/pvTimestampPlugin.h>
-#include <pv/pvDeadbandPlugin.h>
+#include <pv/pvPlugin.h>
 
 using std::tr1::static_pointer_cast;
 using std::tr1::dynamic_pointer_cast;
@@ -77,13 +75,6 @@ PVCopyPtr PVCopy::create(
     PVStructurePtr const &pvRequest, 
     string const & structureName)
 {
-    static bool firstTime = true;
-    if(firstTime) {
-         firstTime = false;
-         PVArrayPlugin::create();
-         PVTimestampPlugin::create();
-         PVDeadbandPlugin::create();
-    }
     PVStructurePtr pvStructure(pvRequest);
     if(structureName.size()>0) {
         if(pvStructure->getStructure()->getNumberFields()>0) {
diff --git a/src/database/pvDatabase.cpp b/src/database/pvDatabase.cpp
index d98417f..0ce5b36 100644
--- a/src/database/pvDatabase.cpp
+++ b/src/database/pvDatabase.cpp
@@ -11,6 +11,10 @@
 
 #include <epicsGuard.h>
 #include <pv/pvStructureCopy.h>
+#include <pv/pvPlugin.h>
+#include <pv/pvArrayPlugin.h>
+#include <pv/pvTimestampPlugin.h>
+#include <pv/pvDeadbandPlugin.h>
 
 #define epicsExportSharedSymbols
 
@@ -18,6 +22,7 @@
 
 using std::tr1::static_pointer_cast;
 using namespace epics::pvData;
+using namespace epics::pvCopy;
 using namespace std;
 
 namespace epics { namespace pvDatabase {
@@ -33,6 +38,8 @@ PVDatabasePtr PVDatabase::getMaster()
     if(getMasterFirstCall) {
         getMasterFirstCall = false;
         pvDatabaseMaster = PVDatabasePtr(new PVDatabase());
+        PVArrayPlugin::create();
+        PVTimestampPlugin::create();
     }    
     return pvDatabaseMaster;
 }