pvCopy.h now pvStructureCopy.h; copy name space now epics::pvCopy

src/copy/Makefile

@@ -2,7 +2,7 @@
 
 SRC_DIRS += $(PVDATABASE_SRC)/copy
 
-INC += pv/pvCopy.h
+INC += pv/pvStructureCopy.h
 INC += pv/pvPlugin.h
 INC += pv/pvArrayPlugin.h
 INC += pv/pvDeadbandPlugin.h

src/copy/pv/pvArrayPlugin.h

@@ -16,7 +16,7 @@
 #include <pv/pvData.h>
 #include <pv/pvPlugin.h>
 
-namespace epics { namespace pvDatabase{
+namespace epics { namespace pvCopy{
 
 class PVArrayPlugin;
 class PVArrayFilter;

src/copy/pv/pvDeadbandPlugin.h

@@ -16,7 +16,7 @@
 #include <pv/pvData.h>
 #include <pv/pvPlugin.h>
 
-namespace epics { namespace pvDatabase{
+namespace epics { namespace pvCopy{
 
 class PVDeadbandPlugin;
 class PVDeadbandFilter;

src/copy/pv/pvPlugin.h

@@ -16,9 +16,9 @@
 #include <string>
 #include <map>
 #include <pv/lock.h>
-#include <pv/pvCopy.h>
+#include <pv/pvStructureCopy.h>
 
-namespace epics { namespace pvDatabase{ 
+namespace epics { namespace pvCopy{ 
 
 class PVPlugin;
 class PVFilter;

src/copy/pv/pvStructureCopy.h

@@ -1,4 +1,4 @@
-/* pvCopy.h */
+/* pvStructureCopy.h */
 /*
  * Copyright information and license terms for this software can be
  * found in the file LICENSE that is included with the distribution
@@ -7,8 +7,8 @@
  * @author Marty Kraimer
  * @date 2013.04
  */
-#ifndef PVCOPY_H
-#define PVCOPY_H
+#ifndef PVSTRUCTURECOPY_H
+#define PVSTRUCTURECOPY_H
 #include <string>
 #include <stdexcept>
 #include <memory>
@@ -18,7 +18,7 @@
 #include <pv/pvData.h>
 #include <pv/bitSet.h>
 
-namespace epics { namespace pvDatabase{ 
+namespace epics { namespace pvCopy{ 
 
 class PVCopyTraverseMasterCallback;
 typedef std::tr1::shared_ptr<PVCopyTraverseMasterCallback> PVCopyTraverseMasterCallbackPtr;
@@ -27,6 +27,11 @@ typedef std::tr1::shared_ptr<PVCopyTraverseMasterCallback> PVCopyTraverseMasterC
  * @brief Callback for traversing master structure
  *
  * Must be implemented by code that creates pvCopy.
+ *
+ * This was originally name pvCopy.h and implemented in pvDataCPP
+ * When it was moved to pvDatabaseCPP it was renamed to prevent conflicts with
+ * the version in pvDataCPP.
+ * Also the namespace was changed from epics::pvData to epics::pvCopy
  */
 class epicsShareClass PVCopyTraverseMasterCallback
 {
@@ -235,4 +240,4 @@ private:
 
 }}
 
-#endif  /* PVCOPY_H */
+#endif  /* PVSTRUCTURECOPY_H */

src/copy/pv/pvTimestampPlugin.h

@@ -17,7 +17,7 @@
 #include <pv/pvPlugin.h>
 #include <pv/pvTimeStamp.h>
 
-namespace epics { namespace pvDatabase{
+namespace epics { namespace pvCopy{
 
 class PVTimestampPlugin;
 class PVTimestampFilter;

src/copy/pvArrayPlugin.cpp

@@ -19,7 +19,7 @@ using std::tr1::static_pointer_cast;
 using std::vector;
 using namespace epics::pvData;
 
-namespace epics { namespace pvDatabase{
+namespace epics { namespace pvCopy{
 
 static ConvertPtr convert = getConvert();
 static std::string name("array");

src/copy/pvCopy.cpp

@@ -17,7 +17,7 @@
 #include <pv/thread.h>
 
 #define epicsExportSharedSymbols
-#include <pv/pvCopy.h>
+#include <pv/pvStructureCopy.h>
 #include <pv/pvArrayPlugin.h>
 #include <pv/pvTimestampPlugin.h>
 #include <pv/pvDeadbandPlugin.h>
@@ -31,7 +31,7 @@ using std::endl;
 using std::vector;
 using namespace epics::pvData;
 
-namespace epics { namespace pvDatabase { 
+namespace epics { namespace pvCopy { 
 
 /**
  * Convenience method for implementing dump.

src/copy/pvDeadbandPlugin.cpp

@@ -19,7 +19,7 @@ using std::tr1::static_pointer_cast;
 using std::vector;
 using namespace epics::pvData;
 
-namespace epics { namespace pvDatabase{
+namespace epics { namespace pvCopy{
 
 static ConvertPtr convert = getConvert();
 static std::string name("deadband");

src/copy/pvPlugin.cpp

@@ -9,7 +9,7 @@
 
 using namespace epics::pvData;
 
-namespace epics { namespace pvDatabase{ 
+namespace epics { namespace pvCopy{ 
 
 typedef std::map<std::string,PVPluginPtr> PVPluginMap;
 

src/copy/pvTimestampPlugin.cpp

@@ -9,7 +9,7 @@
 
 #define epicsExportSharedSymbols
 #include <pv/pvTimestampPlugin.h>
-#include <pv/pvCopy.h>
+#include <pv/pvStructureCopy.h>
 
 using std::string;
 using std::size_t;
@@ -19,7 +19,7 @@ using std::tr1::static_pointer_cast;
 using std::vector;
 using namespace epics::pvData;
 
-namespace epics { namespace pvDatabase{
+namespace epics { namespace pvCopy{
 
 static ConvertPtr convert = getConvert();
 static std::string name("timestamp");