From 2dac5b433d545a9adce79b52b59ca8c1d35d6162 Mon Sep 17 00:00:00 2001 From: lid Date: Sun, 29 Sep 2019 09:35:27 +0800 Subject: [PATCH] fix #40: avoid name conflict by changing parameter name `data` to `bytes` --- Include/Zmq/ZmqMsg.mqh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Include/Zmq/ZmqMsg.mqh b/Include/Zmq/ZmqMsg.mqh index f17e107..9679311 100644 --- a/Include/Zmq/ZmqMsg.mqh +++ b/Include/Zmq/ZmqMsg.mqh @@ -88,9 +88,9 @@ public: size_t size() {return zmq_msg_size(this);} - void getData(uchar &data[]); + void getData(uchar &bytes[]); string getData(); - void setData(const uchar &data[]); + void setData(const uchar &bytes[]); bool more() {return 1==zmq_msg_more(this);} @@ -113,12 +113,12 @@ bool ZmqMsg::setStringData(string data,bool nullterminated) //+------------------------------------------------------------------+ //| Get message data as bytes array | //+------------------------------------------------------------------+ -void ZmqMsg::getData(uchar &data[]) +void ZmqMsg::getData(uchar &bytes[]) { size_t size=size(); intptr_t src=data(); - if(ArraySize(data)