From 5084c72fbe2822f53f89593494512e48c1fd2ea8 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Mon, 25 Jul 2016 01:46:39 +0000 Subject: [PATCH] fix a few discrepancies --- .../library/sharedUtility/src/shared/TemplateParameter.h | 2 +- .../soePlatform/ChatAPI/projects/ChatAPI/ChatAPICore.cpp | 6 +++--- .../soePlatform/ChatAPI/projects/ChatAPI/Response.cpp | 5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/engine/shared/library/sharedUtility/src/shared/TemplateParameter.h b/engine/shared/library/sharedUtility/src/shared/TemplateParameter.h index c4b1cc1a..03d82ff0 100755 --- a/engine/shared/library/sharedUtility/src/shared/TemplateParameter.h +++ b/engine/shared/library/sharedUtility/src/shared/TemplateParameter.h @@ -133,7 +133,7 @@ template inline TemplateBase::TemplateBase(void) : m_dataType(NONE), m_loaded(false), - m_data(nullptr) + m_data() { } // TemplateBase::TemplateBase(void) diff --git a/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatAPICore.cpp b/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatAPICore.cpp index 797c4aba..06bea775 100755 --- a/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatAPICore.cpp +++ b/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatAPICore.cpp @@ -2115,12 +2115,12 @@ namespace ChatSystem ChatAvatar *destAvatar = M.getDestAvatar()->getNewChatAvatar(); ChatAvatar *srcAvatar = M.getSrcAvatar()->getNewChatAvatar(); - if (destRoomCore && !destRoomCore->addBan(M.getDestAvatar())) + if (destRoomCore && (!destRoomCore->addBan(M.getDestAvatar()))) { delete M.getSrcAvatar(); } - if (destRoomCore && !destRoomCore || !destRoom) + if (destRoomCore && (!destRoomCore || !destRoom)) { _chatdebug_("ChatAPI:BadData: MESSAGE_ADDBANAVATAR: destRoom=%p, destRoomCore=%p\n", destRoom, destRoomCore); delete srcAvatar; @@ -3357,4 +3357,4 @@ namespace ChatSystem return returnVal; } -}; \ No newline at end of file +}; diff --git a/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/Response.cpp b/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/Response.cpp index c6b4a23e..ad089499 100755 --- a/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/Response.cpp +++ b/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/Response.cpp @@ -1162,8 +1162,7 @@ namespace ChatSystem m_srcAvatarID(srcAvatarID), m_listLength(0), m_headers(nullptr), - m_cores(nullptr), - m_listLength(0) + m_cores(nullptr) { } @@ -1610,4 +1609,4 @@ namespace ChatSystem get(iter, m_track); get(iter, m_result); } -}; // end namespace \ No newline at end of file +}; // end namespace