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

Avoid data() as it is c++11

Browse Source
This commit is contained in:
Freddie Akeroyd
2022-05-17 15:35:24 +01:00
committed by Andrew Johnson
parent d4bb5952a4
commit 55ab0fd3b8
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/server/pv/responseHandlers.h
View File

@ -96,7 +96,9 @@ public:
EchoTransportSender(osiSockAddr* echoFrom, size_t payloadSize, epics::pvData::ByteBuffer& payloadBuffer) {
memcpy(&_echoFrom, echoFrom, sizeof(osiSockAddr));
toEcho.resize(payloadSize);
payloadBuffer.getArray(toEcho.data(), payloadSize);
if (payloadSize) {
payloadBuffer.getArray(&toEcho[0], payloadSize);
}
}
virtual ~EchoTransportSender() {}
@ -104,7 +106,9 @@ public:
virtual void send(epics::pvData::ByteBuffer* buffer, TransportSendControl* control) OVERRIDE FINAL {
control->startMessage(CMD_ECHO, toEcho.size(), toEcho.size());
control->setRecipient(_echoFrom);
buffer->putArray<char>(toEcho.data(), toEcho.size());
if (toEcho.size() > 0) {
buffer->putArray<char>(&toEcho[0], toEcho.size());
}
}
private: