remove all destroy methods
This commit is contained in:
@ -428,11 +428,6 @@ PVCopy::PVCopy(
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
void PVCopy::destroy()
|
|
||||||
{
|
|
||||||
headNode.reset();
|
|
||||||
}
|
|
||||||
|
|
||||||
bool PVCopy::init(epics::pvData::PVStructurePtr const &pvRequest)
|
bool PVCopy::init(epics::pvData::PVStructurePtr const &pvRequest)
|
||||||
{
|
{
|
||||||
PVStructurePtr pvMasterStructure = pvMaster;
|
PVStructurePtr pvMasterStructure = pvMaster;
|
||||||
|
@ -66,11 +66,6 @@ public:
|
|||||||
* @brief Destructor
|
* @brief Destructor
|
||||||
*/
|
*/
|
||||||
virtual ~ChannelProviderLocal();
|
virtual ~ChannelProviderLocal();
|
||||||
/**
|
|
||||||
* @brief DEPRECATED
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
virtual void destroy(){};
|
|
||||||
/**
|
/**
|
||||||
* @brief Returns the channel provider name.
|
* @brief Returns the channel provider name.
|
||||||
*
|
*
|
||||||
@ -190,11 +185,6 @@ public:
|
|||||||
* @brief Destructor
|
* @brief Destructor
|
||||||
*/
|
*/
|
||||||
virtual ~ChannelLocal();
|
virtual ~ChannelLocal();
|
||||||
/**
|
|
||||||
* @brief DEPRECATED
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
virtual void destroy() {};
|
|
||||||
/**
|
/**
|
||||||
* @brief Detach from the record.
|
* @brief Detach from the record.
|
||||||
*
|
*
|
||||||
|
@ -86,10 +86,6 @@ public:
|
|||||||
* the base class sets the timeStamp to the current time.
|
* the base class sets the timeStamp to the current time.
|
||||||
*/
|
*/
|
||||||
virtual void process();
|
virtual void process();
|
||||||
/**
|
|
||||||
* @brief DEPRECATED
|
|
||||||
*/
|
|
||||||
virtual void destroy() {}
|
|
||||||
/**
|
/**
|
||||||
* @brief remove record from database.
|
* @brief remove record from database.
|
||||||
*
|
*
|
||||||
|
@ -79,7 +79,6 @@ public:
|
|||||||
epics::pvData::PVStructurePtr const &pvRequest,
|
epics::pvData::PVStructurePtr const &pvRequest,
|
||||||
std::string const & structureName);
|
std::string const & structureName);
|
||||||
virtual ~PVCopy(){}
|
virtual ~PVCopy(){}
|
||||||
virtual void destroy();
|
|
||||||
/**
|
/**
|
||||||
* Get the top-level structure of master
|
* Get the top-level structure of master
|
||||||
* @returns The master top-level structure.
|
* @returns The master top-level structure.
|
||||||
|
@ -80,7 +80,6 @@ class ChannelProcessLocal :
|
|||||||
public:
|
public:
|
||||||
POINTER_DEFINITIONS(ChannelProcessLocal);
|
POINTER_DEFINITIONS(ChannelProcessLocal);
|
||||||
virtual ~ChannelProcessLocal();
|
virtual ~ChannelProcessLocal();
|
||||||
virtual void destroy() {} // DEPRECATED
|
|
||||||
static ChannelProcessLocalPtr create(
|
static ChannelProcessLocalPtr create(
|
||||||
ChannelLocalPtr const &channelLocal,
|
ChannelLocalPtr const &channelLocal,
|
||||||
ChannelProcessRequester::shared_pointer const & channelProcessRequester,
|
ChannelProcessRequester::shared_pointer const & channelProcessRequester,
|
||||||
@ -210,7 +209,6 @@ class ChannelGetLocal :
|
|||||||
public:
|
public:
|
||||||
POINTER_DEFINITIONS(ChannelGetLocal);
|
POINTER_DEFINITIONS(ChannelGetLocal);
|
||||||
virtual ~ChannelGetLocal();
|
virtual ~ChannelGetLocal();
|
||||||
virtual void destroy() {} // DEPRECATED
|
|
||||||
static ChannelGetLocalPtr create(
|
static ChannelGetLocalPtr create(
|
||||||
ChannelLocalPtr const &channelLocal,
|
ChannelLocalPtr const &channelLocal,
|
||||||
ChannelGetRequester::shared_pointer const & channelGetRequester,
|
ChannelGetRequester::shared_pointer const & channelGetRequester,
|
||||||
@ -381,7 +379,6 @@ class ChannelPutLocal :
|
|||||||
public:
|
public:
|
||||||
POINTER_DEFINITIONS(ChannelPutLocal);
|
POINTER_DEFINITIONS(ChannelPutLocal);
|
||||||
virtual ~ChannelPutLocal();
|
virtual ~ChannelPutLocal();
|
||||||
virtual void destroy() {} // DEPRECATED
|
|
||||||
static ChannelPutLocalPtr create(
|
static ChannelPutLocalPtr create(
|
||||||
ChannelLocalPtr const &channelLocal,
|
ChannelLocalPtr const &channelLocal,
|
||||||
ChannelPutRequester::shared_pointer const & channelPutRequester,
|
ChannelPutRequester::shared_pointer const & channelPutRequester,
|
||||||
@ -551,7 +548,6 @@ class ChannelPutGetLocal :
|
|||||||
public:
|
public:
|
||||||
POINTER_DEFINITIONS(ChannelPutGetLocal);
|
POINTER_DEFINITIONS(ChannelPutGetLocal);
|
||||||
virtual ~ChannelPutGetLocal();
|
virtual ~ChannelPutGetLocal();
|
||||||
virtual void destroy() {} // DEPRECATED
|
|
||||||
static ChannelPutGetLocalPtr create(
|
static ChannelPutGetLocalPtr create(
|
||||||
ChannelLocalPtr const &channelLocal,
|
ChannelLocalPtr const &channelLocal,
|
||||||
ChannelPutGetRequester::shared_pointer const & channelPutGetRequester,
|
ChannelPutGetRequester::shared_pointer const & channelPutGetRequester,
|
||||||
@ -766,7 +762,6 @@ class ChannelRPCLocal :
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
POINTER_DEFINITIONS(ChannelRPCLocal);
|
POINTER_DEFINITIONS(ChannelRPCLocal);
|
||||||
virtual void destroy() {} // DEPRECATED
|
|
||||||
static ChannelRPCLocalPtr create(
|
static ChannelRPCLocalPtr create(
|
||||||
ChannelLocalPtr const & channelLocal,
|
ChannelLocalPtr const & channelLocal,
|
||||||
ChannelRPCRequester::shared_pointer const & channelRPCRequester,
|
ChannelRPCRequester::shared_pointer const & channelRPCRequester,
|
||||||
@ -958,7 +953,6 @@ class ChannelArrayLocal :
|
|||||||
public:
|
public:
|
||||||
POINTER_DEFINITIONS(ChannelArrayLocal);
|
POINTER_DEFINITIONS(ChannelArrayLocal);
|
||||||
virtual ~ChannelArrayLocal();
|
virtual ~ChannelArrayLocal();
|
||||||
virtual void destroy() {} // DEPRECATED
|
|
||||||
static ChannelArrayLocalPtr create(
|
static ChannelArrayLocalPtr create(
|
||||||
ChannelLocalPtr const &channelLocal,
|
ChannelLocalPtr const &channelLocal,
|
||||||
ChannelArrayRequester::shared_pointer const & channelArrayRequester,
|
ChannelArrayRequester::shared_pointer const & channelArrayRequester,
|
||||||
|
@ -141,7 +141,6 @@ class MonitorLocal :
|
|||||||
public:
|
public:
|
||||||
POINTER_DEFINITIONS(MonitorLocal);
|
POINTER_DEFINITIONS(MonitorLocal);
|
||||||
virtual ~MonitorLocal();
|
virtual ~MonitorLocal();
|
||||||
virtual void destroy() {} // DEPRECATED
|
|
||||||
virtual Status start();
|
virtual Status start();
|
||||||
virtual Status stop();
|
virtual Status stop();
|
||||||
virtual MonitorElementPtr poll();
|
virtual MonitorElementPtr poll();
|
||||||
|
@ -46,7 +46,6 @@ public:
|
|||||||
std::string const & recordName,
|
std::string const & recordName,
|
||||||
epics::pvData::PVStructurePtr const & pvStructure);
|
epics::pvData::PVStructurePtr const & pvStructure);
|
||||||
virtual ~PowerSupply();
|
virtual ~PowerSupply();
|
||||||
virtual void destroy();
|
|
||||||
virtual bool init();
|
virtual bool init();
|
||||||
virtual void process();
|
virtual void process();
|
||||||
void put(double power,double voltage);
|
void put(double power,double voltage);
|
||||||
@ -111,11 +110,6 @@ inline PowerSupply::~PowerSupply()
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
inline void PowerSupply::destroy()
|
|
||||||
{
|
|
||||||
PVRecord::destroy();
|
|
||||||
}
|
|
||||||
|
|
||||||
inline bool PowerSupply::init()
|
inline bool PowerSupply::init()
|
||||||
{
|
{
|
||||||
initPVRecord();
|
initPVRecord();
|
||||||
|
Reference in New Issue
Block a user