From 75e2fa491a08ed2110a8ef6b78e4844a5329f6f5 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 28 Jan 2014 11:26:36 -0800
Subject: [PATCH] some type fixes for marshalling/un-marshalling of data

---
 domain-server/src/DomainServer.cpp     | 1 -
 libraries/shared/src/NodeList.cpp      | 4 ++--
 libraries/shared/src/NodeList.h        | 2 +-
 libraries/shared/src/PacketHeaders.cpp | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 665ef45eb1..62ee855ddb 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -128,7 +128,6 @@ void DomainServer::readAvailableDatagrams() {
                 
                 deconstructPacketHeader(receivedPacket, nodeUUID);
                 packetStream >> nodeType;
-                
                 packetStream >> nodePublicAddress >> nodeLocalAddress;
                 
                 if (nodePublicAddress.getAddress().isNull()) {
diff --git a/libraries/shared/src/NodeList.cpp b/libraries/shared/src/NodeList.cpp
index 83e8d9824c..527840e0cd 100644
--- a/libraries/shared/src/NodeList.cpp
+++ b/libraries/shared/src/NodeList.cpp
@@ -464,11 +464,11 @@ void NodeList::sendDomainServerCheckIn() {
         // check in packet has header, optional UUID, node type, port, IP, node types of interest, null termination
         QByteArray domainServerPacket = byteArrayWithPopluatedHeader(PacketTypeDomainListRequest);
         QDataStream packetStream(&domainServerPacket, QIODevice::Append);
-        
+
         // pack our data to send to the domain-server
         packetStream << _ownerType << _publicSockAddr
             << HifiSockAddr(QHostAddress(getHostOrderLocalAddress()), _nodeSocket.localPort())
-            << (char) _nodeTypesOfInterest.size();
+            << (quint8) _nodeTypesOfInterest.size();
         
         // copy over the bytes for node types of interest, if required
         foreach (NODE_TYPE nodeTypeOfInterest, _nodeTypesOfInterest) {
diff --git a/libraries/shared/src/NodeList.h b/libraries/shared/src/NodeList.h
index 3f811dbad4..f978c5479e 100644
--- a/libraries/shared/src/NodeList.h
+++ b/libraries/shared/src/NodeList.h
@@ -146,7 +146,7 @@ private:
     QString _domainHostname;
     HifiSockAddr _domainSockAddr;
     QUdpSocket _nodeSocket;
-    char _ownerType;
+    NODE_TYPE _ownerType;
     QSet<NODE_TYPE> _nodeTypesOfInterest;
     QUuid _ownerUUID;
     int _numNoReplyDomainCheckIns;
diff --git a/libraries/shared/src/PacketHeaders.cpp b/libraries/shared/src/PacketHeaders.cpp
index fc9511622f..a725198748 100644
--- a/libraries/shared/src/PacketHeaders.cpp
+++ b/libraries/shared/src/PacketHeaders.cpp
@@ -34,7 +34,7 @@ int numBytesArithmeticCodingFromBuffer(const char* checkValue) {
 int packArithmeticallyCodedValue(int value, char* destination) {
     if (value < 255) {
         // less than 255, just pack our value
-        destination[0] = (char) value;
+        destination[0] = (uchar) value;
         return 1;
     } else {
         // pack 255 and then recursively pack on