From 511fb7ae6415f38c795f56aa6b9159b3b14178f9 Mon Sep 17 00:00:00 2001 From: CodeCodon Date: Sun, 9 Aug 2015 01:56:15 -0500 Subject: [PATCH] parenthases and unused vars --- .../ChatServer/src/shared/ChatInterface.cpp | 4 ---- .../library/sharedNetwork/src/linux/Address.cpp | 12 ++++++------ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/engine/server/application/ChatServer/src/shared/ChatInterface.cpp b/engine/server/application/ChatServer/src/shared/ChatInterface.cpp index a25d2c54..64fabd4b 100644 --- a/engine/server/application/ChatServer/src/shared/ChatInterface.cpp +++ b/engine/server/application/ChatServer/src/shared/ChatInterface.cpp @@ -2346,12 +2346,10 @@ void ChatInterface::OnAddInvite(unsigned track, unsigned result, const ChatAvata AvatarIdSequencePair *pair = (AvatarIdSequencePair *)user; - unsigned sequence = 0; ChatAvatarId destId; if (pair) { destId = pair->avatar; - sequence = pair->sequence; delete pair; pair = NULL; @@ -2464,12 +2462,10 @@ void ChatInterface::OnRemoveInvite(unsigned track, unsigned result, const ChatAv AvatarIdSequencePair *pair = (AvatarIdSequencePair *)user; - unsigned sequence = 0; ChatAvatarId inviteeId; if (pair) { inviteeId = pair->avatar; - sequence = pair->sequence; delete pair; pair = NULL; diff --git a/engine/shared/library/sharedNetwork/src/linux/Address.cpp b/engine/shared/library/sharedNetwork/src/linux/Address.cpp index 3832558f..4032f6d5 100644 --- a/engine/shared/library/sharedNetwork/src/linux/Address.cpp +++ b/engine/shared/library/sharedNetwork/src/linux/Address.cpp @@ -251,9 +251,9 @@ const bool Address::operator == (const Address & rhs) const */ const bool Address::operator < (const Address & rhs) const { - return(addr4->sin_addr.s_addr < rhs.addr4->sin_addr.s_addr || - addr4->sin_addr.s_addr == rhs.addr4->sin_addr.s_addr && - addr4->sin_port < rhs.addr4->sin_port); + return((addr4->sin_addr.s_addr < rhs.addr4->sin_addr.s_addr) || + (addr4->sin_addr.s_addr == rhs.addr4->sin_addr.s_addr && + addr4->sin_port < rhs.addr4->sin_port)); } //--------------------------------------------------------------------- @@ -293,9 +293,9 @@ const bool Address::operator != (const Address & rhs) const */ const bool Address::operator > (const Address & rhs) const { - return(addr4->sin_addr.s_addr > rhs.addr4->sin_addr.s_addr || - addr4->sin_addr.s_addr == rhs.addr4->sin_addr.s_addr && - addr4->sin_port > rhs.addr4->sin_port); + return((addr4->sin_addr.s_addr > rhs.addr4->sin_addr.s_addr) || + (addr4->sin_addr.s_addr == rhs.addr4->sin_addr.s_addr && + addr4->sin_port > rhs.addr4->sin_port)); } //---------------------------------------------------------------------