From 68019340a12983b9c8cbbe7d1ad6ce629a56c9ed Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Wed, 14 Oct 2015 09:51:46 -0500 Subject: [PATCH 1/2] fix implicit declaration warnings in the miff parser.yac file --- engine/client/application/Miff/src/linux/parser.yac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/client/application/Miff/src/linux/parser.yac b/engine/client/application/Miff/src/linux/parser.yac index 8412cbea..b40006e4 100644 --- a/engine/client/application/Miff/src/linux/parser.yac +++ b/engine/client/application/Miff/src/linux/parser.yac @@ -27,7 +27,7 @@ #include #include /* for toupper() */ #include /* for wide character (16bit) strings */ - +#include /* for strtoupper and strtolower */ #include /*----------------------------------------------------------------** From 220782606ee87c98f860a02322a7f203ce98d6b4 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Wed, 14 Oct 2015 12:38:27 -0500 Subject: [PATCH 2/2] another warning bites the dust - all significant gcc warns should be done now, we're left only with clang detected warns --- .../shared/objectTemplate/ServerTangibleObjectTemplate.cpp | 5 +++-- .../src/shared/objectTemplate/ServerTangibleObjectTemplate.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerTangibleObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerTangibleObjectTemplate.cpp index a557a075..39d5e817 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 = NULL; if (m_baseData != NULL) @@ -155,7 +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(); + const TriggerVolumeData value = m_triggerVolumes[index]->getValue(); + return value; } // ServerTangibleObjectTemplate::getTriggerVolumes diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerTangibleObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerTangibleObjectTemplate.h index 5c941b2d..785cc5d5 100644 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerTangibleObjectTemplate.h +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerTangibleObjectTemplate.h @@ -84,7 +84,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;