From a645d784d8a66bb1e4298449916689a8f1ece228 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Wed, 4 Feb 2015 11:26:05 -0800 Subject: [PATCH] uint32_t rather than uint, which mac doesn't like --- interface/src/Audio.h | 2 +- interface/src/devices/MotionTracker.h | 2 +- libraries/audio/src/AudioFilterBank.h | 2 +- libraries/gpu/src/gpu/Texture.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/interface/src/Audio.h b/interface/src/Audio.h index be374de959..7b7031d3cb 100644 --- a/interface/src/Audio.h +++ b/interface/src/Audio.h @@ -212,7 +212,7 @@ private: bool _outputStarveDetectionEnabled; quint64 _outputStarveDetectionStartTimeMsec; int _outputStarveDetectionCount; - uint _outputStarveDetectionPeriodMsec; + uint32_t _outputStarveDetectionPeriodMsec; int _outputStarveDetectionThreshold; // Maximum number of starves per _outputStarveDetectionPeriod before increasing buffer size diff --git a/interface/src/devices/MotionTracker.h b/interface/src/devices/MotionTracker.h index 84b909d4fd..6db4374fdf 100644 --- a/interface/src/devices/MotionTracker.h +++ b/interface/src/devices/MotionTracker.h @@ -37,7 +37,7 @@ public: // Semantic and Index types to retreive the JointTrackers of this MotionTracker typedef std::string Semantic; - typedef uint Index; + typedef uint32_t Index; static const Index INVALID_SEMANTIC = -1; static const Index INVALID_PARENT = -2; diff --git a/libraries/audio/src/AudioFilterBank.h b/libraries/audio/src/AudioFilterBank.h index c5f0c4c171..723fa6b270 100644 --- a/libraries/audio/src/AudioFilterBank.h +++ b/libraries/audio/src/AudioFilterBank.h @@ -52,7 +52,7 @@ public: AudioFilterBank() : _sampleRate(0.0f), _frameCount(0) { - for (int i = 0; i < _channelCount; ++i) { + for (uint32_t i = 0; i < _channelCount; ++i) { _buffer[ i ] = NULL; } } diff --git a/libraries/gpu/src/gpu/Texture.cpp b/libraries/gpu/src/gpu/Texture.cpp index 7615c599b0..33df50042e 100755 --- a/libraries/gpu/src/gpu/Texture.cpp +++ b/libraries/gpu/src/gpu/Texture.cpp @@ -175,7 +175,7 @@ Texture::Size Texture::resize(Type type, const Element& texelFormat, uint16 widt // Evaluate the new size with the new format const int DIM_SIZE[] = {1, 1, 1, 6}; - uint size = DIM_SIZE[_type] *_width * _height * _depth * _numSamples * texelFormat.getSize(); + uint32_t size = DIM_SIZE[_type] *_width * _height * _depth * _numSamples * texelFormat.getSize(); // If size change then we need to reset if (changed || (size != getSize())) {