complex macros with ;
This commit is contained in:
@@ -36,7 +36,7 @@
|
||||
#define _PIPEER_PING_TIMEOUT 5.0
|
||||
|
||||
class PIPeer::PeerData: public PIObject {
|
||||
PIOBJECT_SUBCLASS(PeerData, PIObject)
|
||||
PIOBJECT_SUBCLASS(PeerData, PIObject);
|
||||
public:
|
||||
PeerData(const PIString & n);
|
||||
~PeerData();
|
||||
@@ -45,8 +45,8 @@ public:
|
||||
EVENT_HANDLER1(void, dtReceiveFinishedIn, bool, ok) {if (ok) received(name(), dt_in.data());}
|
||||
EVENT_HANDLER1(void, dtReceiveFinishedOut, bool, ok) {if (ok) received(name(), dt_out.data());}
|
||||
EVENT_HANDLER(void, dtThread);
|
||||
EVENT2(received, const PIString &, from, const PIByteArray &, data)
|
||||
EVENT2(sendRequest, const PIString &, to, const PIByteArray &, data)
|
||||
EVENT2(received, const PIString &, from, const PIByteArray &, data);
|
||||
EVENT2(sendRequest, const PIString &, to, const PIByteArray &, data);
|
||||
bool send(const PIByteArray & d);
|
||||
void receivedPacket(uchar type, const PIByteArray & d);
|
||||
void setDist(int dist);
|
||||
@@ -61,11 +61,11 @@ PIPeer::PeerData::PeerData(const PIString & n): PIObject(n) {
|
||||
dt_out.setPacketSize(_PIPEER_MSG_SIZE);
|
||||
dt_in.setCRCEnabled(false);
|
||||
dt_out.setCRCEnabled(false);
|
||||
CONNECTU(&dt_in, sendRequest, this, dtSendRequestIn)
|
||||
CONNECTU(&dt_out, sendRequest, this, dtSendRequestOut)
|
||||
CONNECTU(&dt_in, receiveFinished, this, dtReceiveFinishedIn)
|
||||
CONNECTU(&dt_out, receiveFinished, this, dtReceiveFinishedOut)
|
||||
CONNECTU(&t, started, this, dtThread)
|
||||
CONNECTU(&dt_in, sendRequest, this, dtSendRequestIn);
|
||||
CONNECTU(&dt_out, sendRequest, this, dtSendRequestOut);
|
||||
CONNECTU(&dt_in, receiveFinished, this, dtReceiveFinishedIn);
|
||||
CONNECTU(&dt_out, receiveFinished, this, dtReceiveFinishedOut);
|
||||
CONNECTU(&t, started, this, dtThread);
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user