From 3bc89bfe0e12fd19de2f8bf20da488b7b73f7b7a Mon Sep 17 00:00:00 2001
From: mrkraimer <mrkraimer@comcast.net>
Date: Tue, 21 Jul 2020 10:33:50 -0400
Subject: [PATCH] remove all destroy methods

---
 src/copy/pvCopy.cpp             |  5 -----
 src/pv/channelProviderLocal.h   | 10 ----------
 src/pv/pvDatabase.h             |  4 ----
 src/pv/pvStructureCopy.h        |  1 -
 src/pvAccess/channelLocal.cpp   |  6 ------
 src/pvAccess/monitorFactory.cpp |  1 -
 test/src/powerSupply.h          |  6 ------
 7 files changed, 33 deletions(-)

diff --git a/src/copy/pvCopy.cpp b/src/copy/pvCopy.cpp
index db915b5..fd98a24 100644
--- a/src/copy/pvCopy.cpp
+++ b/src/copy/pvCopy.cpp
@@ -428,11 +428,6 @@ PVCopy::PVCopy(
 {
 }
 
-void PVCopy::destroy()
-{
-    headNode.reset();
-}
-
 bool PVCopy::init(epics::pvData::PVStructurePtr const &pvRequest)
 {
     PVStructurePtr pvMasterStructure = pvMaster;
diff --git a/src/pv/channelProviderLocal.h b/src/pv/channelProviderLocal.h
index c952c74..be70650 100644
--- a/src/pv/channelProviderLocal.h
+++ b/src/pv/channelProviderLocal.h
@@ -66,11 +66,6 @@ public:
      * @brief Destructor
      */
     virtual ~ChannelProviderLocal();
-    /**
-     * @brief DEPRECATED
-     *
-     */
-    virtual void destroy(){};
     /**
      * @brief Returns the channel provider name.
      *
@@ -190,11 +185,6 @@ public:
      * @brief Destructor
      */
     virtual ~ChannelLocal();
-    /**
-     * @brief DEPRECATED
-     *
-     */
-    virtual void destroy() {};
     /**
      * @brief Detach from the record.
      *
diff --git a/src/pv/pvDatabase.h b/src/pv/pvDatabase.h
index 56ff8c6..3d9ccd0 100644
--- a/src/pv/pvDatabase.h
+++ b/src/pv/pvDatabase.h
@@ -86,10 +86,6 @@ public:
      *  the base class sets the timeStamp to the current time.
      */
     virtual void process();
-    /**
-     *  @brief DEPRECATED
-     */
-    virtual void destroy() {}
     /**
      *  @brief remove record from database.
      *
diff --git a/src/pv/pvStructureCopy.h b/src/pv/pvStructureCopy.h
index d09bd3f..3ae37a3 100644
--- a/src/pv/pvStructureCopy.h
+++ b/src/pv/pvStructureCopy.h
@@ -79,7 +79,6 @@ public:
         epics::pvData::PVStructurePtr const &pvRequest,
         std::string const & structureName);
     virtual ~PVCopy(){}
-    virtual void destroy();
     /**
      * Get the top-level structure of master
      * @returns The master top-level structure.
diff --git a/src/pvAccess/channelLocal.cpp b/src/pvAccess/channelLocal.cpp
index 293bc27..0a71ee5 100644
--- a/src/pvAccess/channelLocal.cpp
+++ b/src/pvAccess/channelLocal.cpp
@@ -80,7 +80,6 @@ class ChannelProcessLocal :
 public:
     POINTER_DEFINITIONS(ChannelProcessLocal);
     virtual ~ChannelProcessLocal();
-    virtual void destroy() {} // DEPRECATED
     static ChannelProcessLocalPtr create(
         ChannelLocalPtr const &channelLocal,
         ChannelProcessRequester::shared_pointer const & channelProcessRequester,
@@ -210,7 +209,6 @@ class ChannelGetLocal :
 public:
     POINTER_DEFINITIONS(ChannelGetLocal);
     virtual ~ChannelGetLocal();
-    virtual void destroy() {} // DEPRECATED
     static ChannelGetLocalPtr create(
         ChannelLocalPtr const &channelLocal,
         ChannelGetRequester::shared_pointer const & channelGetRequester,
@@ -381,7 +379,6 @@ class ChannelPutLocal :
 public:
     POINTER_DEFINITIONS(ChannelPutLocal);
     virtual ~ChannelPutLocal();
-    virtual void destroy() {} // DEPRECATED
     static ChannelPutLocalPtr create(
         ChannelLocalPtr const &channelLocal,
         ChannelPutRequester::shared_pointer const & channelPutRequester,
@@ -551,7 +548,6 @@ class ChannelPutGetLocal :
 public:
     POINTER_DEFINITIONS(ChannelPutGetLocal);
     virtual ~ChannelPutGetLocal();
-    virtual void destroy() {} // DEPRECATED
     static ChannelPutGetLocalPtr create(
         ChannelLocalPtr const &channelLocal,
         ChannelPutGetRequester::shared_pointer const & channelPutGetRequester,
@@ -766,7 +762,6 @@ class ChannelRPCLocal :
 {
 public:
     POINTER_DEFINITIONS(ChannelRPCLocal);
-    virtual void destroy() {} // DEPRECATED
     static ChannelRPCLocalPtr create(
         ChannelLocalPtr const & channelLocal,
         ChannelRPCRequester::shared_pointer const & channelRPCRequester,
@@ -958,7 +953,6 @@ class ChannelArrayLocal :
 public:
     POINTER_DEFINITIONS(ChannelArrayLocal);
     virtual ~ChannelArrayLocal();
-    virtual void destroy() {} // DEPRECATED
     static ChannelArrayLocalPtr create(
         ChannelLocalPtr const &channelLocal,
         ChannelArrayRequester::shared_pointer const & channelArrayRequester,
diff --git a/src/pvAccess/monitorFactory.cpp b/src/pvAccess/monitorFactory.cpp
index e2dcd90..c467c50 100644
--- a/src/pvAccess/monitorFactory.cpp
+++ b/src/pvAccess/monitorFactory.cpp
@@ -141,7 +141,6 @@ class MonitorLocal :
 public:
     POINTER_DEFINITIONS(MonitorLocal);
     virtual ~MonitorLocal();
-    virtual void destroy() {} // DEPRECATED
     virtual Status start();
     virtual Status stop();
     virtual MonitorElementPtr poll();
diff --git a/test/src/powerSupply.h b/test/src/powerSupply.h
index 339a562..fb5b99a 100644
--- a/test/src/powerSupply.h
+++ b/test/src/powerSupply.h
@@ -46,7 +46,6 @@ public:
         std::string const & recordName,
         epics::pvData::PVStructurePtr const & pvStructure);
     virtual ~PowerSupply();
-    virtual void destroy();
     virtual bool init();
     virtual void process();
     void put(double power,double voltage);
@@ -111,11 +110,6 @@ inline PowerSupply::~PowerSupply()
 {
 }
 
-inline void PowerSupply::destroy()
-{
-    PVRecord::destroy();
-}
-
 inline bool PowerSupply::init()
 {
     initPVRecord();