From 12cf580937d0459c813b37de333ff35a14523e38 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Sat, 3 Dec 2016 08:28:21 +0000 Subject: [PATCH] fix all the warnings --- .../server/application/ChatServer/src/shared/ChatServer.cpp | 6 +++--- .../shared/objectTemplate/ServerTangibleObjectTemplate.cpp | 6 +++--- .../shared/objectTemplate/ServerTangibleObjectTemplate.h | 2 +- .../VChatAPI/utils2.0/utils/Base/serializeStringVector.h | 2 -- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/engine/server/application/ChatServer/src/shared/ChatServer.cpp b/engine/server/application/ChatServer/src/shared/ChatServer.cpp index c8e12a6d..542cc4cf 100755 --- a/engine/server/application/ChatServer/src/shared/ChatServer.cpp +++ b/engine/server/application/ChatServer/src/shared/ChatServer.cpp @@ -100,11 +100,11 @@ namespace ChatServerNamespace if(fullName.find(ConfigChatServer::getClusterName()) == std::string::npos) { - fullName = ConfigChatServer::getClusterName() + '+' + fullName; + fullName = std::string(ConfigChatServer::getClusterName()) + std::string("+") + fullName; } if(fullName.find(ConfigChatServer::getGameCode()) == std::string::npos) { - fullName = ConfigChatServer::getGameCode() + '+' + fullName; + fullName = std::string(ConfigChatServer::getGameCode()) + std::string("+") + fullName; } if(fullName.find("SOE") == std::string::npos) { @@ -122,7 +122,7 @@ namespace ChatServerNamespace std::set s_notSubscribedClients; // Control log output for chat room related methods - bool const s_enableChatRoomLogs = false; + bool const s_enableChatRoomLogs = false; // make configurable? } using namespace ChatServerNamespace; diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerTangibleObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerTangibleObjectTemplate.cpp index 23505a15..2b4722d3 100644 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerTangibleObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerTangibleObjectTemplate.cpp @@ -124,7 +124,7 @@ Object * ServerTangibleObjectTemplate::createObject(void) const } // ServerTangibleObjectTemplate::createObject //@BEGIN TFD -const TriggerVolumeData & ServerTangibleObjectTemplate::getTriggerVolumes(int index) const +const TriggerVolumeData ServerTangibleObjectTemplate::getTriggerVolumes(int index) const { const ServerTangibleObjectTemplate * base = nullptr; if (m_baseData != nullptr) @@ -155,8 +155,8 @@ const TriggerVolumeData & ServerTangibleObjectTemplate::getTriggerVolumes(int in } DEBUG_FATAL(index < 0 || static_cast(index) >= m_triggerVolumes.size(), ("template param index out of range")); - const TriggerVolumeData & value = m_triggerVolumes[index]->getValue(); - return value; + + return m_triggerVolumes[index]->getValue(); } // ServerTangibleObjectTemplate::getTriggerVolumes size_t ServerTangibleObjectTemplate::getTriggerVolumesCount(void) const diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerTangibleObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerTangibleObjectTemplate.h index 30d0e447..73292939 100644 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerTangibleObjectTemplate.h +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerTangibleObjectTemplate.h @@ -87,7 +87,7 @@ public: }; public: - const TriggerVolumeData & getTriggerVolumes(int index) const; + const TriggerVolumeData getTriggerVolumes(int index) const; size_t getTriggerVolumesCount(void) const; CombatSkeleton getCombatSkeleton(bool testData = false) const; int getMaxHitPoints(bool testData = false) const; diff --git a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/serializeStringVector.h b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/serializeStringVector.h index efa6c80e..873ad9b4 100644 --- a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/serializeStringVector.h +++ b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/serializeStringVector.h @@ -221,8 +221,6 @@ namespace soe return bytes; } - operator stringVector_t () { return *this; } - //unsigned Read(const unsigned char * stream, unsigned size); //DECLARE_SCRIBE_MEMBERS };