EPICS_base/pva2pva
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

some more OVERRIDE/FINAL

Browse Source
This commit is contained in:
Michael Davidsaver
2018-02-07 11:11:25 -08:00
parent a1cb3d302a
commit b7de8ba8b0
3 changed files with 34 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pdbApp/pdb.h
View File

@ -40,21 +40,21 @@ struct epicsShareClass PDBProvider : public epics::pvAccess::ChannelProvider,
virtual ~PDBProvider();
// ChannelProvider
virtual void destroy();
virtual std::string getProviderName();
virtual void destroy() OVERRIDE FINAL;
virtual std::string getProviderName() OVERRIDE FINAL;
virtual epics::pvAccess::ChannelFind::shared_pointer channelFind(std::string const & channelName,
epics::pvAccess::ChannelFindRequester::shared_pointer const & channelFindRequester);
virtual epics::pvAccess::ChannelFind::shared_pointer channelList(epics::pvAccess::ChannelListRequester::shared_pointer const & channelListRequester);
epics::pvAccess::ChannelFindRequester::shared_pointer const & channelFindRequester) OVERRIDE FINAL;
virtual epics::pvAccess::ChannelFind::shared_pointer channelList(epics::pvAccess::ChannelListRequester::shared_pointer const & channelListRequester) OVERRIDE FINAL;
virtual epics::pvAccess::Channel::shared_pointer createChannel(std::string const & channelName,
epics::pvAccess::ChannelRequester::shared_pointer const & channelRequester,
short priority = PRIORITY_DEFAULT);
short priority = PRIORITY_DEFAULT) OVERRIDE FINAL;
virtual epics::pvAccess::Channel::shared_pointer createChannel(std::string const & channelName,
epics::pvAccess::ChannelRequester::shared_pointer const & channelRequester,
short priority, std::string const & address);
short priority, std::string const & address) OVERRIDE FINAL;
// ChannelFind
virtual std::tr1::shared_ptr<ChannelProvider> getChannelProvider() { return shared_from_this(); }
virtual void cancel() {/* our channelFind() is synchronous, so nothing to cancel */}
virtual std::tr1::shared_ptr<ChannelProvider> getChannelProvider() OVERRIDE FINAL { return shared_from_this(); }
virtual void cancel() OVERRIDE FINAL {/* our channelFind() is synchronous, so nothing to cancel */}
typedef std::map<std::string, PDBPV::shared_pointer> persist_pv_map_t;
persist_pv_map_t persist_pv_map;

30
pdbApp/pdbgroup.h
View File

@ -124,7 +124,7 @@ struct epicsShareClass PDBGroupPV : public PDBPV
virtual
epics::pvAccess::Channel::shared_pointer
connect(const std::tr1::shared_ptr<PDBProvider>& prov,
const epics::pvAccess::ChannelRequester::shared_pointer& req) OVERRIDE;
const epics::pvAccess::ChannelRequester::shared_pointer& req) OVERRIDE FINAL;
void addMonitor(PDBGroupMonitor*);
void removeMonitor(PDBGroupMonitor*);
@ -149,12 +149,12 @@ struct epicsShareClass PDBGroupChannel : public BaseChannel,
virtual epics::pvAccess::ChannelPut::shared_pointer createChannelPut(
epics::pvAccess::ChannelPutRequester::shared_pointer const & requester,
epics::pvData::PVStructure::shared_pointer const & pvRequest);
epics::pvData::PVStructure::shared_pointer const & pvRequest) OVERRIDE FINAL;
virtual epics::pvData::Monitor::shared_pointer createMonitor(
epics::pvData::MonitorRequester::shared_pointer const & requester,
epics::pvData::PVStructure::shared_pointer const & pvRequest);
epics::pvData::PVStructure::shared_pointer const & pvRequest) OVERRIDE FINAL;
virtual void printInfo(std::ostream& out);
virtual void printInfo(std::ostream& out) OVERRIDE FINAL;
};
struct PDBGroupPut : public epics::pvAccess::ChannelPut,
@ -180,16 +180,14 @@ struct PDBGroupPut : public epics::pvAccess::ChannelPut,
const epics::pvData::PVStructure::shared_pointer& pvReq);
virtual ~PDBGroupPut();
virtual void destroy() { pvif.clear(); channel.reset(); requester.reset(); }
virtual void lock() {}
virtual void unlock() {}
virtual std::tr1::shared_ptr<epics::pvAccess::Channel> getChannel() { return channel; }
virtual void cancel() {}
virtual void lastRequest() {}
virtual void destroy() OVERRIDE FINAL { pvif.clear(); channel.reset(); requester.reset(); }
virtual std::tr1::shared_ptr<epics::pvAccess::Channel> getChannel() OVERRIDE FINAL { return channel; }
virtual void cancel() OVERRIDE FINAL {}
virtual void lastRequest() OVERRIDE FINAL {}
virtual void put(
epics::pvData::PVStructure::shared_pointer const & pvPutStructure,
epics::pvData::BitSet::shared_pointer const & putBitSet);
virtual void get();
epics::pvData::BitSet::shared_pointer const & putBitSet) OVERRIDE FINAL;
virtual void get() OVERRIDE FINAL;
};
struct PDBGroupMonitor : public BaseMonitor
@ -207,11 +205,11 @@ struct PDBGroupMonitor : public BaseMonitor
const epics::pvData::PVStructure::shared_pointer& pvReq);
virtual ~PDBGroupMonitor();
virtual void onStart();
virtual void onStop();
virtual void requestUpdate();
virtual void onStart() OVERRIDE FINAL;
virtual void onStop() OVERRIDE FINAL;
virtual void requestUpdate() OVERRIDE FINAL;
virtual void destroy();
virtual void destroy() OVERRIDE FINAL;
};

25
pdbApp/pdbsingle.h
View File

@ -62,9 +62,10 @@ struct epicsShareClass PDBSinglePV : public PDBPV
void activate();
virtual
epics::pvAccess::Channel::shared_pointer
connect(const std::tr1::shared_ptr<PDBProvider>& prov,
const epics::pvAccess::ChannelRequester::shared_pointer& req);
const epics::pvAccess::ChannelRequester::shared_pointer& req) OVERRIDE FINAL;
void addMonitor(PDBSingleMonitor*);
void removeMonitor(PDBSingleMonitor*);
@ -120,16 +121,14 @@ struct PDBSinglePut : public epics::pvAccess::ChannelPut,
const epics::pvData::PVStructure::shared_pointer& pvReq);
virtual ~PDBSinglePut();
virtual void destroy() { pvif.reset(); channel.reset(); requester.reset(); }
virtual void lock() {}
virtual void unlock() {}
virtual std::tr1::shared_ptr<epics::pvAccess::Channel> getChannel() { return channel; }
virtual void cancel();
virtual void lastRequest() {}
virtual void destroy() OVERRIDE FINAL { pvif.reset(); channel.reset(); requester.reset(); }
virtual std::tr1::shared_ptr<epics::pvAccess::Channel> getChannel() OVERRIDE FINAL { return channel; }
virtual void cancel() OVERRIDE FINAL;
virtual void lastRequest() OVERRIDE FINAL {}
virtual void put(
epics::pvData::PVStructure::shared_pointer const & pvPutStructure,
epics::pvData::BitSet::shared_pointer const & putBitSet);
virtual void get();
epics::pvData::BitSet::shared_pointer const & putBitSet) OVERRIDE FINAL;
virtual void get() OVERRIDE FINAL;
};
struct PDBSingleMonitor : public BaseMonitor
@ -145,11 +144,11 @@ struct PDBSingleMonitor : public BaseMonitor
const epics::pvData::PVStructure::shared_pointer& pvReq);
virtual ~PDBSingleMonitor();
virtual void onStart();
virtual void onStop();
virtual void requestUpdate();
virtual void onStart() OVERRIDE FINAL;
virtual void onStop() OVERRIDE FINAL;
virtual void requestUpdate() OVERRIDE FINAL;
virtual void destroy();
virtual void destroy() OVERRIDE FINAL;
};
#endif // PDBSINGLE_H