From 8bd301e45e333869948d34c4b5c3c9898917d750 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Fri, 11 Dec 2015 16:03:44 -0800 Subject: [PATCH] More warning fixes --- interface/src/devices/Faceshift.cpp | 2 +- libraries/animation/src/AnimInverseKinematics.cpp | 8 ++++---- libraries/animation/src/AnimSkeleton.cpp | 4 ++-- libraries/animation/src/Rig.cpp | 4 ++-- libraries/networking/src/ReceivedPacketProcessor.h | 2 +- libraries/octree/src/JurisdictionMap.cpp | 2 +- libraries/octree/src/JurisdictionMap.h | 2 +- libraries/octree/src/OctreeEditPacketSender.cpp | 4 ++-- libraries/octree/src/OctreeSceneStats.cpp | 4 ++-- libraries/render-utils/src/AnimDebugDraw.cpp | 2 +- libraries/shared/src/PropertyFlags.h | 2 +- tools/scribe/src/TextTemplate.cpp | 3 ++- 12 files changed, 20 insertions(+), 19 deletions(-) diff --git a/interface/src/devices/Faceshift.cpp b/interface/src/devices/Faceshift.cpp index 3596c79419..81c099c740 100644 --- a/interface/src/devices/Faceshift.cpp +++ b/interface/src/devices/Faceshift.cpp @@ -255,7 +255,7 @@ void Faceshift::receive(const QByteArray& buffer) { } case fsMsg::MSG_OUT_BLENDSHAPE_NAMES: { const vector& names = static_pointer_cast(msg)->blendshape_names(); - for (auto i = 0; i < names.size(); i++) { + for (int i = 0; i < (int)names.size(); i++) { if (names[i] == "EyeBlink_L") { _leftBlinkIndex = i; diff --git a/libraries/animation/src/AnimInverseKinematics.cpp b/libraries/animation/src/AnimInverseKinematics.cpp index 9276b96714..415ee72d7b 100644 --- a/libraries/animation/src/AnimInverseKinematics.cpp +++ b/libraries/animation/src/AnimInverseKinematics.cpp @@ -114,7 +114,7 @@ void AnimInverseKinematics::computeTargets(const AnimVariantMap& animVars, std:: } if (removeUnfoundJoints) { - auto numVars = _targetVarVec.size(); + int numVars = (int)_targetVarVec.size(); int i = 0; while (i < numVars) { if (_targetVarVec[i].jointIndex == -1) { @@ -145,7 +145,7 @@ void AnimInverseKinematics::solveWithCyclicCoordinateDescent(const std::vector 0) { _relativePoses[i].rot = _accumulators[i].getAverage(); _accumulators[i].clear(); diff --git a/libraries/animation/src/AnimSkeleton.cpp b/libraries/animation/src/AnimSkeleton.cpp index 72fd806a1d..c9c6e43a02 100644 --- a/libraries/animation/src/AnimSkeleton.cpp +++ b/libraries/animation/src/AnimSkeleton.cpp @@ -31,7 +31,7 @@ AnimSkeleton::AnimSkeleton(const std::vector& joints) { } int AnimSkeleton::nameToJointIndex(const QString& jointName) const { - for (auto i = 0; i < _joints.size(); i++) { + for (int i = 0; i < (int)_joints.size(); i++) { if (_joints[i].name == jointName) { return i; } @@ -101,7 +101,7 @@ void AnimSkeleton::buildSkeletonFromJoints(const std::vector& joints) _relativeDefaultPoses.reserve(joints.size()); // iterate over FBXJoints and extract the bind pose information. - for (auto i = 0; i < joints.size(); i++) { + for (int i = 0; i < (int)joints.size(); i++) { // build relative and absolute default poses glm::mat4 rotTransform = glm::mat4_cast(_joints[i].preRotation * _joints[i].rotation * _joints[i].postRotation); diff --git a/libraries/animation/src/Rig.cpp b/libraries/animation/src/Rig.cpp index 56135ce821..acfb4f87db 100644 --- a/libraries/animation/src/Rig.cpp +++ b/libraries/animation/src/Rig.cpp @@ -434,7 +434,7 @@ void Rig::calcAnimAlpha(float speed, const std::vector& referenceSpeeds, void Rig::computeEyesInRootFrame(const AnimPoseVec& poses) { // TODO: use cached eye/hips indices for these calculations - auto numPoses = poses.size(); + int numPoses = (int)poses.size(); int hipsIndex = _animSkeleton->nameToJointIndex(QString("Hips")); int headIndex = _animSkeleton->nameToJointIndex(QString("Head")); if (hipsIndex > 0 && headIndex > 0) { @@ -1164,7 +1164,7 @@ void Rig::computeAvatarBoundingCapsule( // even if they do not have legs (default robot) totalExtents.addPoint(glm::vec3(0.0f)); - auto numPoses = finalPoses.size(); + int numPoses = (int)finalPoses.size(); for (int i = 0; i < numPoses; i++) { const FBXJointShapeInfo& shapeInfo = geometry.joints.at(i).shapeInfo; AnimPose pose = finalPoses[i]; diff --git a/libraries/networking/src/ReceivedPacketProcessor.h b/libraries/networking/src/ReceivedPacketProcessor.h index 1d9580f3d0..cbb27fa5d6 100644 --- a/libraries/networking/src/ReceivedPacketProcessor.h +++ b/libraries/networking/src/ReceivedPacketProcessor.h @@ -44,7 +44,7 @@ public: } /// How many received packets waiting are to be processed - size_t packetsToProcessCount() const { return _packets.size(); } + int packetsToProcessCount() const { return (int)_packets.size(); } float getIncomingPPS() const { return _incomingPPS.getAverage(); } float getProcessedPPS() const { return _processedPPS.getAverage(); } diff --git a/libraries/octree/src/JurisdictionMap.cpp b/libraries/octree/src/JurisdictionMap.cpp index 5e66e21242..cac2211d29 100644 --- a/libraries/octree/src/JurisdictionMap.cpp +++ b/libraries/octree/src/JurisdictionMap.cpp @@ -278,7 +278,7 @@ std::unique_ptr JurisdictionMap::packIntoPacket() { packet->write(reinterpret_cast(_rootOctalCode), bytes); // if and only if there's a root jurisdiction, also include the end nodes - auto endNodeCount = _endNodes.size(); + int endNodeCount = (int)_endNodes.size(); packet->writePrimitive(endNodeCount); for (int i=0; i < endNodeCount; i++) { diff --git a/libraries/octree/src/JurisdictionMap.h b/libraries/octree/src/JurisdictionMap.h index 18d2bbbeed..fb217e59db 100644 --- a/libraries/octree/src/JurisdictionMap.h +++ b/libraries/octree/src/JurisdictionMap.h @@ -52,7 +52,7 @@ public: unsigned char* getRootOctalCode() const { return _rootOctalCode; } unsigned char* getEndNodeOctalCode(int index) const { return _endNodes[index]; } - size_t getEndNodeCount() const { return _endNodes.size(); } + int getEndNodeCount() const { return (int)_endNodes.size(); } void copyContents(unsigned char* rootCodeIn, const std::vector& endNodesIn); diff --git a/libraries/octree/src/OctreeEditPacketSender.cpp b/libraries/octree/src/OctreeEditPacketSender.cpp index d3a72ce113..ad59dcbf99 100644 --- a/libraries/octree/src/OctreeEditPacketSender.cpp +++ b/libraries/octree/src/OctreeEditPacketSender.cpp @@ -149,7 +149,7 @@ void OctreeEditPacketSender::queuePendingPacketToNodes(std::unique_ptr _pendingPacketsLock.lock(); _preServerSingleMessagePackets.push_back(std::move(packet)); // if we've saved MORE than our max, then clear out the oldest packet... - auto allPendingMessages = _preServerSingleMessagePackets.size() + _preServerEdits.size(); + int allPendingMessages = (int)(_preServerSingleMessagePackets.size() + _preServerEdits.size()); if (allPendingMessages > _maxPendingMessages) { _preServerSingleMessagePackets.pop_front(); } @@ -210,7 +210,7 @@ void OctreeEditPacketSender::queueOctreeEditMessage(PacketType type, QByteArray& _preServerEdits.push_back(messagePair); // if we've saved MORE than out max, then clear out the oldest packet... - auto allPendingMessages = _preServerSingleMessagePackets.size() + _preServerEdits.size(); + int allPendingMessages = (int)(_preServerSingleMessagePackets.size() + _preServerEdits.size()); if (allPendingMessages > _maxPendingMessages) { _preServerEdits.pop_front(); } diff --git a/libraries/octree/src/OctreeSceneStats.cpp b/libraries/octree/src/OctreeSceneStats.cpp index 8b9334eafd..f761d9ad05 100644 --- a/libraries/octree/src/OctreeSceneStats.cpp +++ b/libraries/octree/src/OctreeSceneStats.cpp @@ -418,12 +418,12 @@ int OctreeSceneStats::packIntoPacket() { // add the root jurisdiction if (_jurisdictionRoot) { // copy the - auto bytes = bytesRequiredForCodeLength(numberOfThreeBitSectionsInCode(_jurisdictionRoot)); + int bytes = (int)bytesRequiredForCodeLength(numberOfThreeBitSectionsInCode(_jurisdictionRoot)); _statsPacket->writePrimitive(bytes); _statsPacket->write(reinterpret_cast(_jurisdictionRoot), bytes); // if and only if there's a root jurisdiction, also include the end elements - auto endNodeCount = _jurisdictionEndNodes.size(); + int endNodeCount = (int)_jurisdictionEndNodes.size(); _statsPacket->writePrimitive(endNodeCount); diff --git a/libraries/render-utils/src/AnimDebugDraw.cpp b/libraries/render-utils/src/AnimDebugDraw.cpp index aa366f04b9..04a1962899 100644 --- a/libraries/render-utils/src/AnimDebugDraw.cpp +++ b/libraries/render-utils/src/AnimDebugDraw.cpp @@ -321,7 +321,7 @@ void AnimDebugDraw::update() { const float POSE_RADIUS = 0.1f; // 10 cm // figure out how many verts we will need. - size_t numVerts = 0; + int numVerts = 0; for (auto& iter : _absolutePoses) { AnimSkeleton::ConstPointer& skeleton = std::get<0>(iter.second); diff --git a/libraries/shared/src/PropertyFlags.h b/libraries/shared/src/PropertyFlags.h index a4ff193a77..985a08fa05 100644 --- a/libraries/shared/src/PropertyFlags.h +++ b/libraries/shared/src/PropertyFlags.h @@ -201,7 +201,7 @@ inline size_t PropertyFlags::decode(const uint8_t* data, size_t size) { clear(); // we are cleared out! size_t bytesConsumed = 0; - auto bitCount = BITS_IN_BYTE * size; + int bitCount = BITS_IN_BYTE * (int)size; int encodedByteCount = 1; // there is at least 1 byte (after the leadBits) int leadBits = 1; // there is always at least 1 lead bit diff --git a/tools/scribe/src/TextTemplate.cpp b/tools/scribe/src/TextTemplate.cpp index 01567d9255..3ccb0baea0 100755 --- a/tools/scribe/src/TextTemplate.cpp +++ b/tools/scribe/src/TextTemplate.cpp @@ -730,7 +730,8 @@ int TextTemplate::evalBlockGeneration(std::ostream& dst, const BlockPointer& blo BlockPointer funcBlock = _config->_funcs.findFunc(block->command.arguments.front().c_str()); if (funcBlock) { // before diving in the func tree, let's modify the vars with the local defs: - auto nbParams = std::min(block->command.arguments.size(), funcBlock->command.arguments.size()); + int nbParams = (int)std::min(block->command.arguments.size(), + funcBlock->command.arguments.size()); std::vector< String > paramCache; paramCache.push_back(""); String val;