cleanup and quiet warnings

This commit is contained in:
Michael Davidsaver
2019-07-14 20:35:11 -07:00
parent b06aa1831f
commit badf14c4fa
11 changed files with 11 additions and 14 deletions

View File

@ -133,7 +133,7 @@ struct Getter : public pvac::detail::CallbackStorage,
callEvent(G, status.isSuccess()? pvac::GetEvent::Success : pvac::GetEvent::Fail);
}
virtual void show(std::ostream &strm) const
virtual void show(std::ostream &strm) const OVERRIDE FINAL
{
strm << "Operation(Get"
"\"" << name() <<"\""

View File

@ -193,7 +193,7 @@ struct Putter : public pvac::detail::CallbackStorage,
callEvent(G, status.isSuccess()? pvac::GetEvent::Success : pvac::GetEvent::Fail);
}
virtual void show(std::ostream &strm) const
virtual void show(std::ostream &strm) const OVERRIDE FINAL
{
strm << "Operation(Put"
"\"" << name() <<"\""

View File

@ -140,7 +140,7 @@ struct RPCer : public pvac::detail::CallbackStorage,
callEvent(G, status.isSuccess()? pvac::GetEvent::Success : pvac::GetEvent::Fail);
}
virtual void show(std::ostream &strm) const
virtual void show(std::ostream &strm) const OVERRIDE FINAL
{
strm << "Operation(RPC"
"\"" << name() <<"\""

View File

@ -18,7 +18,6 @@ namespace pvAccess {
BeaconHandler::BeaconHandler(Context::shared_pointer const & context,
const osiSockAddr* responseFrom) :
_context(Context::weak_pointer(context)),
_responseFrom(*responseFrom),
_mutex(),
_serverGUID(),
_serverChangeCount(-1),
@ -34,7 +33,7 @@ BeaconHandler::~BeaconHandler()
void BeaconHandler::beaconNotify(osiSockAddr* /*from*/, int8 remoteTransportRevision,
TimeStamp* timestamp, ServerGUID const & guid, int16 sequentalID,
int16 changeCount,
PVFieldPtr /*data*/)
const PVFieldPtr& /*data*/)
{
bool networkChanged = updateBeacon(remoteTransportRevision, timestamp, guid, sequentalID, changeCount);
// TODO: reduce search timers

View File

@ -104,8 +104,7 @@ AbstractCodec::AbstractCodec(
_lastMessageStartPosition(std::numeric_limits<size_t>::max()),_lastSegmentedMessageType(0),
_lastSegmentedMessageCommand(0), _nextMessagePayloadOffset(0),
_byteOrderFlag(EPICS_BYTE_ORDER == EPICS_ENDIAN_BIG ? 0x80 : 0x00),
_clientServerFlag(serverFlag ? 0x40 : 0x00),
_socketSendBufferSize(socketSendBufferSize)
_clientServerFlag(serverFlag ? 0x40 : 0x00)
{
if (_socketBuffer.getSize() < 2*MAX_ENSURE_SIZE)
throw std::invalid_argument(

View File

@ -60,7 +60,7 @@ public:
ServerGUID const &guid,
epics::pvData::int16 sequentalID,
epics::pvData::int16 changeCount,
epics::pvData::PVFieldPtr data);
const epics::pvData::PVFieldPtr& data);
private:
/**
* Context instance.
@ -69,7 +69,6 @@ private:
/**
* Remote address.
*/
const osiSockAddr _responseFrom;
/**
* Mutex
*/

View File

@ -284,7 +284,7 @@ protected:
*/
ResponseHandler::shared_pointer _responseHandler;
virtual void run();
virtual void run() OVERRIDE FINAL;
private:
bool processBuffer(Transport::shared_pointer const & transport, osiSockAddr& fromAddress, epics::pvData::ByteBuffer* receiveBuffer);

View File

@ -298,7 +298,6 @@ private:
protected:
const epics::pvData::int8 _clientServerFlag;
private:
const size_t _socketSendBufferSize;
public:
mutable epics::pvData::Mutex _mutex;

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;

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;
}

View File

@ -569,6 +569,7 @@ public:
void waitGet(double timeout);
void waitPut(double timeout);
void stopEvents();
virtual ~TestClient() {}
private:
TestClient(string const &channelName,PVStructurePtr const & pvRequest);
string channelName;