epics/pvAccess
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

cleanup and quiet warnings

Browse Source
This commit is contained in:
Michael Davidsaver
2019-07-15 14:06:06 -07:00
parent b06aa1831f
commit badf14c4fa
11 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/pv/responseHandlers.h
+1 -1
View File
@@ -373,7 +373,7 @@ public:
epics::pvData::BitSet::shared_pointer getPutBitSet();
epics::pvData::PVStructure::shared_pointer getPutPVStructure();
void send(epics::pvData::ByteBuffer* buffer, TransportSendControl* control);
void send(epics::pvData::ByteBuffer* buffer, TransportSendControl* control) OVERRIDE FINAL;
private:
// Note: this forms a reference loop, which is broken in destroy()
ChannelPut::shared_pointer _channelPut;
src/server/server.cpp
+2 -2
View File
@@ -120,7 +120,7 @@ StaticProvider::StaticProvider(const std::string &name)
impl->internal_self = impl;
impl->finder = pva::ChannelFind::buildDummy(impl);
// wrap ref to call destroy when all external refs (from DyamicProvider::impl) are released.
impl.reset(impl.get(), pvd::Destroyable::cleaner(impl));
impl.reset(impl.get(), pva::Destroyable::cleaner(impl));
impl->external_self = impl;
}
@@ -262,7 +262,7 @@ DynamicProvider::DynamicProvider(const std::string &name,
impl->internal_self = impl;
impl->finder = pva::ChannelFind::buildDummy(impl);
// wrap ref to call destroy when all external refs (from DyamicProvider::impl) are released.
impl.reset(impl.get(), pvd::Destroyable::cleaner(impl));
impl.reset(impl.get(), pva::Destroyable::cleaner(impl));
impl->external_self = impl;
}