From aa848df2272add2e3fcd73e8485000454bf43309 Mon Sep 17 00:00:00 2001 From: "Anthony J. Thibault" Date: Thu, 5 Sep 2019 17:43:07 -0700 Subject: [PATCH] warning fixes --- libraries/animation/src/AnimBlendDirectional.cpp | 4 ++-- libraries/animation/src/AnimNode.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/animation/src/AnimBlendDirectional.cpp b/libraries/animation/src/AnimBlendDirectional.cpp index d111a6fe08..4e7c67f276 100644 --- a/libraries/animation/src/AnimBlendDirectional.cpp +++ b/libraries/animation/src/AnimBlendDirectional.cpp @@ -75,12 +75,12 @@ const AnimPoseVec& AnimBlendDirectional::evaluate(const AnimVariantMap& animVars alpha.y += 1.0f; } } - std::array alphas = { + std::array alphas = {{ alpha.x * alpha.y, (1.0f - alpha.x) * alpha.y, (1.0f - alpha.x) * (1.0f - alpha.y), alpha.x * (1.0f - alpha.y) - }; + }}; // evaluate children std::array poseVecs; diff --git a/libraries/animation/src/AnimNode.h b/libraries/animation/src/AnimNode.h index 3dfe9dfe8c..3ec671fcd7 100644 --- a/libraries/animation/src/AnimNode.h +++ b/libraries/animation/src/AnimNode.h @@ -100,9 +100,9 @@ public: } int findChildIndexByName(const QString& id) { - for (int i = 0; i < _children.size(); ++i) { + for (size_t i = 0; i < _children.size(); ++i) { if (_children[i]->getID() == id) { - return i; + return (int)i; } } return -1;