From 6f18c1febf585d1ef14b3db673c8a3cd81f572e1 Mon Sep 17 00:00:00 2001 From: mrkraimer Date: Wed, 20 Jul 2016 06:50:58 -0400 Subject: [PATCH] another attempt to fix issue 31 --- .gitignore | 1 + src/pv/pvaClient.h | 18 +++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 8b3be2f..a4eb8a2 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ envPaths configure/*.local !configure/ExampleRELEASE.local **/O.* +QtC-* diff --git a/src/pv/pvaClient.h b/src/pv/pvaClient.h index 867e50d..608e1a5 100644 --- a/src/pv/pvaClient.h +++ b/src/pv/pvaClient.h @@ -1472,14 +1472,14 @@ public: */ void destroy() EPICS_DEPRECATED {} private: - virtual std::string getRequesterName(); - virtual void message(std::string const & message,epics::pvData::MessageType messageType); - virtual void monitorConnect( + std::string getRequesterName(); + void message(std::string const & message,epics::pvData::MessageType messageType); + void monitorConnect( const epics::pvData::Status& status, epics::pvData::MonitorPtr const & monitor, epics::pvData::StructureConstPtr const & structure); - virtual void unlisten(epics::pvData::MonitorPtr const & monitor); - virtual void monitorEvent(epics::pvData::MonitorPtr const & monitor); + void unlisten(epics::pvData::MonitorPtr const & monitor); + void monitorEvent(epics::pvData::MonitorPtr const & monitor); PvaClientMonitor( PvaClientPtr const &pvaClient, @@ -1602,12 +1602,12 @@ private: PvaClientPtr const &pvaClient, epics::pvAccess::Channel::shared_pointer const & channel, epics::pvData::PVStructurePtr const &pvRequest); - virtual std::string getRequesterName(); - virtual void message(std::string const & message,epics::pvData::MessageType messageType); - virtual void rpcConnect( + std::string getRequesterName(); + void message(std::string const & message,epics::pvData::MessageType messageType); + void rpcConnect( const epics::pvData::Status& status, epics::pvAccess::ChannelRPC::shared_pointer const & channelRPC); - virtual void requestDone( + void requestDone( const epics::pvData::Status& status, epics::pvAccess::ChannelRPC::shared_pointer const & channelRPC, epics::pvData::PVStructure::shared_pointer const & pvResponse);