Merge branch 'development' into cmake/SPEC-7484

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;

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<uint32_t>(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();
         }

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

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>(lambda));
 
-        return { *this, m_tasks.size() - 1 };
+        return { *this, aznumeric_cast<uint32_t>(m_tasks.size() - 1) };
     }
 
     template <typename... Lambdas>