From 85bfcf0eea104a5fd5722fa98c7cb758a7f38d5b Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Mon, 14 Jul 2014 09:15:24 -0700 Subject: [PATCH] remove warnings about signed/unsigned comparison --- interface/src/devices/MotionTracker.cpp | 2 +- interface/src/devices/MotionTracker.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/src/devices/MotionTracker.cpp b/interface/src/devices/MotionTracker.cpp index fe41f89a07..a7fa87d403 100644 --- a/interface/src/devices/MotionTracker.cpp +++ b/interface/src/devices/MotionTracker.cpp @@ -106,7 +106,7 @@ void MotionTracker::updateAllAbsTransform() { _jointsArray[0].updateAbsFromLocTransform(0); // Because we know the hierarchy is stored from root down the branches let's just traverse and update - for (Index i = 1; i < _jointsArray.size(); i++) { + for (Index i = 1; i < (Index)(_jointsArray.size()); i++) { JointTracker* joint = _jointsArray.data() + i; joint->updateAbsFromLocTransform(_jointsArray.data() + joint->getParent()); } diff --git a/interface/src/devices/MotionTracker.h b/interface/src/devices/MotionTracker.h index a8c0395359..42ddc6768c 100644 --- a/interface/src/devices/MotionTracker.h +++ b/interface/src/devices/MotionTracker.h @@ -84,8 +84,8 @@ public: /// Access a Joint from it's index. /// Index 0 is always the "Root". /// if the index is Invalid then returns NULL. - const JointTracker* getJointTracker(Index index) const { return ((index > 0) && (index < _jointsArray.size()) ? _jointsArray.data() + index : NULL); } - JointTracker* editJointTracker(Index index) { return ((index > 0) && (index < _jointsArray.size()) ? _jointsArray.data() + index : NULL); } + const JointTracker* getJointTracker(Index index) const { return ((index > 0) && (index < (Index)(_jointsArray.size())) ? _jointsArray.data() + index : NULL); } + JointTracker* editJointTracker(Index index) { return ((index > 0) && (index < (Index)(_jointsArray.size())) ? _jointsArray.data() + index : NULL); } /// From a semantic, find the Index of the Joint. /// \return the index of the mapped Joint or INVALID_SEMANTIC if the semantic is not knowned.