lineCode
diff --git a/‎benchmarks/src/BenchmarkGrid.h‎
Lines changed: 3 additions & 3 deletions b/‎benchmarks/src/BenchmarkGrid.h‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎benchmarks/src/BenchmarkLifeSim.h‎
Lines changed: 1 addition & 1 deletion b/‎benchmarks/src/BenchmarkLifeSim.h‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/engine/PulsecountEngine.cpp‎
Lines changed: 7 additions & 4 deletions b/‎src/engine/PulsecountEngine.cpp‎
Lines changed: 7 additions & 4 deletions
diff --git a/‎src/engine/SubtreeEngine.cpp‎
Lines changed: 4 additions & 1 deletion b/‎src/engine/SubtreeEngine.cpp‎
Lines changed: 4 additions & 1 deletion
@@ -35,7 +35,7 @@ class GridGraphGenerator
     using Func2T = std::function<TValue(TValue,TValue)>;
 
     using SignalVectT   = std::vector<MySignal>;
-    using WidthVectT    = std::vector<int>;
+    using WidthVectT    = std::vector<size_t>;
 
     SignalVectT InputSignals;
     SignalVectT OutputSignals;
@@ -56,9 +56,9 @@ class GridGraphGenerator
         SignalVectT* curBuf = &buf1;
         SignalVectT* nextBuf = &buf2;
 
-        int curWidth = InputSignals.size();
+        size_t curWidth = InputSignals.size();
 
-        int nodeCount = 1;
+        size_t nodeCount = 1;
         nodeCount += curWidth;
 
         for (auto targetWidth : Widths)
 
@@ -288,7 +288,7 @@ struct Benchmark_LifeSim : public BenchmarkBase<D>
         vector<unique_ptr<Animal<D>>> animals;
 
         std::mt19937 gen( 2015 );
-        std::uniform_int_distribution<unsigned> dist( 0u, theWorld.Regions.size()-1 );
+        std::uniform_int_distribution<size_t> dist( 0u, theWorld.Regions.size()-1 );
 
         for (int i=0; i<params.N; i++)
         {
 
@@ -207,13 +207,16 @@ template <typename TTask, typename TIt, typename ... TArgs>
 void spawnTasks
 (
     task& rootTask, task_list& spawnList,
-    const uint count, TIt start, TIt end,
+    const size_t count, TIt start, TIt end,
     TArgs& ... args
 )
 {
-    rootTask.set_ref_count(1 + count);
+    assert(1 + count <=
+        static_cast<size_t>((std::numeric_limits<int>::max)()));
 
-    for (uint i=0; i < (count - 1); i++)
+    rootTask.set_ref_count(1 + static_cast<int>(count));
+
+    for (size_t i=0; i < (count - 1); i++)
     {
         spawnList.push_back(*new(rootTask.allocate_child())
             TTask(args ..., start, start + chunk_size));
@@ -230,7 +233,7 @@ void spawnTasks
 
 void EngineBase::Propagate(Turn& turn)
 {
-    const uint initialTaskCount = (changedInputs_.size() - 1) / chunk_size + 1;
+    const size_t initialTaskCount = (changedInputs_.size() - 1) / chunk_size + 1;
 
     spawnTasks<MarkerTask>(rootTask_, spawnList_, initialTaskCount,
         changedInputs_.begin(), changedInputs_.end());
 
@@ -178,7 +178,10 @@ void EngineBase::Propagate(Turn& turn)
     // Phase 2
     isInPhase2_ = true;
 
-    rootTask_.set_ref_count(1 + subtreeRoots_.size());
+    assert((1 + subtreeRoots_.size()) <=
+        static_cast<size_t>((std::numeric_limits<int>::max)()));
+
+    rootTask_.set_ref_count(1 + static_cast<int>(subtreeRoots_.size()));
 
     for (auto* node : subtreeRoots_)
     {
Original file line number	Diff line number	Diff line change
@@ -288,7 +288,7 @@ struct Benchmark_LifeSim : public BenchmarkBase<D>
288	288	vector<unique_ptr<Animal<D>>> animals;
289	289
290	290	std::mt19937 gen( 2015 );
291		- std::uniform_int_distribution<unsigned> dist( 0u, theWorld.Regions.size()-1 );
	291	+ std::uniform_int_distribution<size_t> dist( 0u, theWorld.Regions.size()-1 );
292	292
293	293	for (int i=0; i<params.N; i++)
294	294	{
Original file line number	Diff line number	Diff line change
@@ -207,13 +207,16 @@ template <typename TTask, typename TIt, typename ... TArgs>
207	207	void spawnTasks
208	208	(
209	209	task& rootTask, task_list& spawnList,
210		- const uint count, TIt start, TIt end,
	210	+ const size_t count, TIt start, TIt end,
211	211	TArgs& ... args
212	212	)
213	213	{
214		- rootTask.set_ref_count(1 + count);
	214	+ assert(1 + count <=
	215	+ static_cast<size_t>((std::numeric_limits<int>::max)()));
215	216
216		- for (uint i=0; i < (count - 1); i++)
	217	+ rootTask.set_ref_count(1 + static_cast<int>(count));
	218	+
	219	+ for (size_t i=0; i < (count - 1); i++)
217	220	{
218	221	spawnList.push_back(*new(rootTask.allocate_child())
219	222	TTask(args ..., start, start + chunk_size));
@@ -230,7 +233,7 @@ void spawnTasks
230	233
231	234	void EngineBase::Propagate(Turn& turn)
232	235	{
233		- const uint initialTaskCount = (changedInputs_.size() - 1) / chunk_size + 1;
	236	+ const size_t initialTaskCount = (changedInputs_.size() - 1) / chunk_size + 1;
234	237
235	238	spawnTasks<MarkerTask>(rootTask_, spawnList_, initialTaskCount,
236	239	changedInputs_.begin(), changedInputs_.end());