From 402f7dc075382d7f69b3f2da04485b580402ae93 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 7 Jul 2015 17:56:05 -0700 Subject: [PATCH] correct PingType_t pack and PacketList readData --- libraries/networking/src/LimitedNodeList.cpp | 2 +- libraries/networking/src/PacketList.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp index 2a833dc94b..2572280613 100644 --- a/libraries/networking/src/LimitedNodeList.cpp +++ b/libraries/networking/src/LimitedNodeList.cpp @@ -575,7 +575,7 @@ std::unique_ptr constructICEPingReplyPacket(const QByteArray& pingPack // pack the ICE ID and then the ping type icePingReplyPacket->write(iceID.toRfc4122()); - icePingReplyPacket->write(&pingType, sizeof(pingType)); + icePingReplyPacket->write(reinterpret_cast(&pingType), sizeof(pingType)); return icePingReplyPacket; } diff --git a/libraries/networking/src/PacketList.h b/libraries/networking/src/PacketList.h index a194121324..64d8871dda 100644 --- a/libraries/networking/src/PacketList.h +++ b/libraries/networking/src/PacketList.h @@ -34,7 +34,7 @@ public: void setExtendedHeader(const QByteArray& extendedHeader) { _extendedHeader = extendedHeader; } protected: qint64 writeData(const char* data, qint64 maxSize); - qint64 readData(const char* data, qint64 maxSize) { return 0; }; + qint64 readData(char* data, qint64 maxSize) { return 0; } private: std::unique_ptr createPacketWithExtendedHeader();