From c27cd7ae426a49de46a45738d3e8b7f70b6c281a Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 15 Jul 2013 16:49:36 -0700 Subject: [PATCH] couple of type squishes in NodeList --- interface/src/Application.cpp | 2 +- libraries/shared/src/NodeList.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 82851355b7..a9313e7549 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -3271,7 +3271,7 @@ void* Application::networkReceive(void* args) { case PACKET_TYPE_Z_COMMAND: case PACKET_TYPE_ERASE_VOXEL: case PACKET_TYPE_ENVIRONMENT_DATA: { - Node *voxelServer = NodeList::getInstance()->soloNodeOfType(NODE_TYPE_VOXEL_SERVER); + Node* voxelServer = NodeList::getInstance()->soloNodeOfType(NODE_TYPE_VOXEL_SERVER); if (voxelServer) { voxelServer->lock(); diff --git a/libraries/shared/src/NodeList.cpp b/libraries/shared/src/NodeList.cpp index 6d79b9471a..004568584d 100644 --- a/libraries/shared/src/NodeList.cpp +++ b/libraries/shared/src/NodeList.cpp @@ -147,8 +147,8 @@ void NodeList::processBulkNodeData(sockaddr *senderAddress, unsigned char *packe int numBytesPacketHeader = numBytesForPacketHeader(packetData); - unsigned char *startPosition = packetData; - unsigned char *currentPosition = startPosition + numBytesPacketHeader; + unsigned char* startPosition = packetData; + unsigned char* currentPosition = startPosition + numBytesPacketHeader; unsigned char packetHolder[numTotalBytes]; // we've already verified packet version for the bulk packet, so all head data in the packet is also up to date