From bff2c7a5e7f54f4842cc57ff7d53dffa66fe6a21 Mon Sep 17 00:00:00 2001 From: Christian Speckner Date: Sat, 9 Dec 2017 20:25:18 +0100 Subject: [PATCH] Fix a bunch of warnings in XCode / clang. --- src/common/LinkedObjectPool.hxx | 2 +- src/common/RewindManager.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/LinkedObjectPool.hxx b/src/common/LinkedObjectPool.hxx index 17f320fcf..8d358f84a 100644 --- a/src/common/LinkedObjectPool.hxx +++ b/src/common/LinkedObjectPool.hxx @@ -200,7 +200,7 @@ class LinkedObjectPool #endif uInt32 capacity() const { return CAPACITY; } - uInt32 size() const { return myList.size(); } + size_t size() const { return myList.size(); } bool empty() const { return myList.size() == 0; } bool full() const { return myList.size() >= CAPACITY; } diff --git a/src/common/RewindManager.cxx b/src/common/RewindManager.cxx index 6527aff04..4193ff375 100644 --- a/src/common/RewindManager.cxx +++ b/src/common/RewindManager.cxx @@ -126,9 +126,9 @@ void RewindManager::compressStates() uInt64 lastCycle = currentCycle; double expectedCycles = 76 * 262.0; // == cycles of 1 frame, TODO: use actual number of scanlines double maxDelta = 0; - uInt32 removeIdx = 0; + size_t removeIdx = 0; - uInt32 idx = myStateList.size() - 1; + size_t idx = myStateList.size() - 1; for(auto it = myStateList.last(); it != myStateList.first(); --it) { cerr << *it << endl << endl; // debug code