From e396269d78bb032525850065196e96488dd3adb1 Mon Sep 17 00:00:00 2001 From: Leonardo Murillo Date: Tue, 19 Mar 2013 11:02:47 -0600 Subject: [PATCH] Switching to unsigned --- shared/src/Agent.cpp | 6 +++--- shared/src/Agent.h | 8 ++++---- shared/src/AgentList.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/shared/src/Agent.cpp b/shared/src/Agent.cpp index f48d139eae..2c0d6b8927 100644 --- a/shared/src/Agent.cpp +++ b/shared/src/Agent.cpp @@ -14,7 +14,7 @@ Agent::Agent() {} -Agent::Agent(sockaddr *agentPublicSocket, sockaddr *agentLocalSocket, char agentType, int16_t thisAgentId) { +Agent::Agent(sockaddr *agentPublicSocket, sockaddr *agentLocalSocket, char agentType, uint16_t thisAgentId) { publicSocket = new sockaddr; memcpy(publicSocket, agentPublicSocket, sizeof(sockaddr)); @@ -76,11 +76,11 @@ void Agent::setType(char newType) { type = newType; } -int16_t Agent::getAgentId() { +uint16_t Agent::getAgentId() { return agentId; } -void Agent::setAgentId(int16_t thisAgentId) { +void Agent::setAgentId(uint16_t thisAgentId) { agentId = thisAgentId; } diff --git a/shared/src/Agent.h b/shared/src/Agent.h index edb8f67f50..61f01b4b60 100644 --- a/shared/src/Agent.h +++ b/shared/src/Agent.h @@ -16,7 +16,7 @@ class Agent { public: Agent(); - Agent(sockaddr *agentPublicSocket, sockaddr *agentLocalSocket, char agentType, int16_t thisAgentId); + Agent(sockaddr *agentPublicSocket, sockaddr *agentLocalSocket, char agentType, uint16_t thisAgentId); Agent(const Agent &otherAgent); ~Agent(); Agent& operator=(Agent otherAgent); @@ -25,8 +25,8 @@ class Agent { bool matches(sockaddr *otherPublicSocket, sockaddr *otherLocalSocket, char otherAgentType); char getType(); void setType(char newType); - int16_t getAgentId(); - void setAgentId(int16_t thisAgentId); + uint16_t getAgentId(); + void setAgentId(uint16_t thisAgentId); double getFirstRecvTimeUsecs(); void setFirstRecvTimeUsecs(double newTimeUsecs); double getLastRecvTimeUsecs(); @@ -46,7 +46,7 @@ class Agent { void swap(Agent &first, Agent &second); sockaddr *publicSocket, *localSocket, *activeSocket; char type; - int16_t agentId; + uint16_t agentId; double firstRecvTimeUsecs; double lastRecvTimeUsecs; AgentData *linkedData; diff --git a/shared/src/AgentList.h b/shared/src/AgentList.h index d1c607f066..b7e12c9627 100644 --- a/shared/src/AgentList.h +++ b/shared/src/AgentList.h @@ -45,7 +45,7 @@ class AgentList { UDPSocket agentSocket; std::vector agents; pthread_t removeSilentAgentsThread; - int16_t lastAgentId; + uint16_t lastAgentId; int indexOfMatchingAgent(sockaddr *senderAddress); void handlePingReply(sockaddr *agentAddress); };