caProvider: remove deprecation warnings
make no-op destroy() private to prevent accidental usage.
This commit is contained in:
@@ -100,10 +100,6 @@ public:
|
||||
|
||||
virtual void printInfo(std::ostream& out);
|
||||
|
||||
/* --------------- Destroyable --------------- */
|
||||
|
||||
virtual void destroy() EPICS_DEPRECATED {};
|
||||
|
||||
/* ---------------------------------------------------------------- */
|
||||
|
||||
void threadAttach();
|
||||
@@ -116,6 +112,10 @@ public:
|
||||
|
||||
private:
|
||||
|
||||
/* --------------- Destroyable --------------- */
|
||||
|
||||
virtual void destroy() {}
|
||||
|
||||
CAChannel(std::string const & channelName,
|
||||
CAChannelProvider::shared_pointer const & channelProvider,
|
||||
ChannelRequester::shared_pointer const & channelRequester);
|
||||
@@ -182,12 +182,12 @@ public:
|
||||
virtual std::string getRequesterName() { return "CAChannelGet";}
|
||||
/* --------------- ChannelBaseRequester --------------- */
|
||||
virtual void channelDisconnect(bool destroy);
|
||||
/* --------------- Destroyable --------------- */
|
||||
virtual void destroy() EPICS_DEPRECATED {};
|
||||
|
||||
void activate();
|
||||
|
||||
private:
|
||||
/* --------------- Destroyable --------------- */
|
||||
virtual void destroy() {}
|
||||
|
||||
CAChannelGet(CAChannel::shared_pointer const & _channel,
|
||||
ChannelGetRequester::shared_pointer const & _channelGetRequester,
|
||||
@@ -249,13 +249,13 @@ public:
|
||||
virtual std::string getRequesterName() { return "CAChannelPut";}
|
||||
/* --------------- ChannelBaseRequester --------------- */
|
||||
virtual void channelDisconnect(bool destroy);
|
||||
/* --------------- Destroyable --------------- */
|
||||
|
||||
virtual void destroy() EPICS_DEPRECATED {};
|
||||
|
||||
void activate();
|
||||
|
||||
private:
|
||||
/* --------------- Destroyable --------------- */
|
||||
|
||||
virtual void destroy() {}
|
||||
|
||||
CAChannelPut(CAChannel::shared_pointer const & _channel,
|
||||
ChannelPutRequester::shared_pointer const & _channelPutRequester,
|
||||
@@ -313,10 +313,10 @@ public:
|
||||
virtual std::string getRequesterName() { return "CAChannelMonitor";}
|
||||
/* --------------- ChannelBaseRequester --------------- */
|
||||
virtual void channelDisconnect(bool destroy);
|
||||
/* --------------- Destroyable --------------- */
|
||||
virtual void destroy() EPICS_DEPRECATED {};
|
||||
void activate();
|
||||
private:
|
||||
/* --------------- Destroyable --------------- */
|
||||
virtual void destroy() {}
|
||||
|
||||
CAChannelMonitor(CAChannel::shared_pointer const & _channel,
|
||||
MonitorRequester::shared_pointer const & _monitorRequester,
|
||||
|
||||
@@ -61,9 +61,6 @@ public:
|
||||
ChannelRequester::shared_pointer const & channelRequester,
|
||||
short priority,
|
||||
std::string const & address);
|
||||
|
||||
virtual void destroy() EPICS_DEPRECATED {};
|
||||
|
||||
void addChannel(const CAChannelPtr & get);
|
||||
|
||||
/* ---------------------------------------------------------------- */
|
||||
@@ -72,6 +69,7 @@ public:
|
||||
|
||||
|
||||
private:
|
||||
virtual void destroy() EPICS_DEPRECATED {}
|
||||
void initialize();
|
||||
ca_client_context* current_context;
|
||||
epics::pvData::Mutex channelListMutex;
|
||||
|
||||
Reference in New Issue
Block a user