diff --git a/Code/Framework/AzCore/AzCore/Task/TaskExecutor.cpp b/Code/Framework/AzCore/AzCore/Task/TaskExecutor.cpp index 293b88b2e6..13db590291 100644 --- a/Code/Framework/AzCore/AzCore/Task/TaskExecutor.cpp +++ b/Code/Framework/AzCore/AzCore/Task/TaskExecutor.cpp @@ -37,7 +37,7 @@ namespace AZ Task** cursor = m_successors.data(); - for (size_t i = 0; i != m_tasks.size(); ++i) + for (uint32_t i = 0; i != m_tasks.size(); ++i) { Task& task = m_tasks[i]; task.m_graph = this; diff --git a/Code/Framework/AzCore/AzCore/Task/TaskGraph.cpp b/Code/Framework/AzCore/AzCore/Task/TaskGraph.cpp index 86e4f846d5..3fb93903c9 100644 --- a/Code/Framework/AzCore/AzCore/Task/TaskGraph.cpp +++ b/Code/Framework/AzCore/AzCore/Task/TaskGraph.cpp @@ -64,8 +64,9 @@ namespace AZ } m_compiledTaskGraph->m_waitEvent = waitEvent; - m_compiledTaskGraph->m_remaining = m_compiledTaskGraph->m_tasks.size() + (m_retained ? 1 : 0); - for (size_t i = 0; i != m_compiledTaskGraph->m_tasks.size(); ++i) + uint32_t taskCount = aznumeric_cast(m_compiledTaskGraph->m_tasks.size()); + m_compiledTaskGraph->m_remaining = taskCount + (m_retained ? 1 : 0); + for (uint32_t i = 0; i != taskCount; ++i) { m_compiledTaskGraph->m_tasks[i].Init(); } diff --git a/Code/Framework/AzCore/AzCore/Task/TaskGraph.h b/Code/Framework/AzCore/AzCore/Task/TaskGraph.h index d133593508..4b454c63de 100644 --- a/Code/Framework/AzCore/AzCore/Task/TaskGraph.h +++ b/Code/Framework/AzCore/AzCore/Task/TaskGraph.h @@ -46,10 +46,10 @@ namespace AZ void PrecedesInternal(TaskToken& comesAfter); // Only the TaskGraph should be creating TaskToken - TaskToken(TaskGraph& parent, size_t index); + TaskToken(TaskGraph& parent, uint32_t index); TaskGraph& m_parent; - size_t m_index; + uint32_t m_index; }; // A TaskGraphEvent may be used to block until a task graph has finished executing. Usage diff --git a/Code/Framework/AzCore/AzCore/Task/TaskGraph.inl b/Code/Framework/AzCore/AzCore/Task/TaskGraph.inl index 1971ddbbca..e0ac74ba9d 100644 --- a/Code/Framework/AzCore/AzCore/Task/TaskGraph.inl +++ b/Code/Framework/AzCore/AzCore/Task/TaskGraph.inl @@ -10,7 +10,7 @@ namespace AZ { - inline TaskToken::TaskToken(TaskGraph& parent, size_t index) + inline TaskToken::TaskToken(TaskGraph& parent, uint32_t index) : m_parent{ parent } , m_index{ index } { @@ -50,7 +50,7 @@ namespace AZ m_tasks.emplace_back(desc, AZStd::forward(lambda)); - return { *this, m_tasks.size() - 1 }; + return { *this, aznumeric_cast(m_tasks.size() - 1) }; } template