From a8dd7b7e1fb124f2380102b835658eb91aca80d2 Mon Sep 17 00:00:00 2001 From: Simon Walton Date: Mon, 25 Feb 2019 17:14:22 -0800 Subject: [PATCH] Fix gcc error about defining templates outside their namespace Also warning about hiding virtual function. --- assignment-client/src/avatars/AvatarMixerClientData.h | 1 + assignment-client/src/avatars/AvatarMixerSlave.cpp | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/assignment-client/src/avatars/AvatarMixerClientData.h b/assignment-client/src/avatars/AvatarMixerClientData.h index a11f218a7b..98c8d7e15b 100644 --- a/assignment-client/src/avatars/AvatarMixerClientData.h +++ b/assignment-client/src/avatars/AvatarMixerClientData.h @@ -45,6 +45,7 @@ public: using HRCTime = p_high_resolution_clock::time_point; using PerNodeTraitVersions = std::unordered_map; + using NodeData::parseData; // Avoid clang warning about hiding. int parseData(ReceivedMessage& message, const SlaveSharedData& SlaveSharedData); MixerAvatar& getAvatar() { return *_avatar; } const MixerAvatar& getAvatar() const { return *_avatar; } diff --git a/assignment-client/src/avatars/AvatarMixerSlave.cpp b/assignment-client/src/avatars/AvatarMixerSlave.cpp index 7d25268a6b..9ad3cff7e1 100644 --- a/assignment-client/src/avatars/AvatarMixerSlave.cpp +++ b/assignment-client/src/avatars/AvatarMixerSlave.cpp @@ -308,7 +308,8 @@ namespace { } // Close anonymous namespace. // Specialize computePriority() for avatars: -template<> float PrioritySortUtil::PriorityQueue::computePriority(const SortableAvatar& thing) const { +namespace PrioritySortUtil { +template<> float PriorityQueue::computePriority(const SortableAvatar& thing) const { static constexpr float AVATAR_HERO_BONUS { 25.0f }; // Higher than any normal priority. float priority = std::numeric_limits::min(); @@ -323,6 +324,7 @@ template<> float PrioritySortUtil::PriorityQueue::computePriorit return priority; } +} void AvatarMixerSlave::broadcastAvatarDataToAgent(const SharedNodePointer& node) { const float AVATAR_HERO_FRACTION { 0.4f };