From 7d7e1ff28ac0b47d71e38b46d8b62d59b46a6e0b Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Sat, 15 Mar 2014 23:37:52 -0700 Subject: [PATCH] one more crack at this signedness comparisons on unix --- assignment-client/src/octree/OctreeSendThread.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/assignment-client/src/octree/OctreeSendThread.cpp b/assignment-client/src/octree/OctreeSendThread.cpp index 0c99e94c04..498ddb9e2c 100644 --- a/assignment-client/src/octree/OctreeSendThread.cpp +++ b/assignment-client/src/octree/OctreeSendThread.cpp @@ -140,10 +140,11 @@ int OctreeSendThread::handlePacketSend(const SharedNodePointer& node, OctreeQuer if (nodeData->stats.isReadyToSend()) { // Send the stats message to the client unsigned char* statsMessage = nodeData->stats.getStatsMessage(); - unsigned int statsMessageLength = nodeData->stats.getStatsMessageLength(); + int statsMessageLength = nodeData->stats.getStatsMessageLength(); + int piggyBackSize = nodeData->getPacketLength() + statsMessageLength; // If the size of the stats message and the voxel message will fit in a packet, then piggyback them - if (nodeData->getPacketLength() + statsMessageLength < MAX_PACKET_SIZE) { + if (piggyBackSize < MAX_PACKET_SIZE) { // copy voxel message to back of stats message memcpy(statsMessage + statsMessageLength, nodeData->getPacket(), nodeData->getPacketLength());