From 95914e3fd61b3c7b6356115246e2e107bc720a03 Mon Sep 17 00:00:00 2001
From: pappeste <pappeste@amazon.com>
Date: Thu, 24 Jun 2021 18:10:14 -0700
Subject: [PATCH] merging from development + fixing linux

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
---
 .../Dependency/TestImpactSourceCoveringTestsSerializer.cpp  | 4 ++--
 Gems/AWSMetrics/Code/Source/MetricsManager.cpp              | 2 +-
 .../Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderAsset.cpp | 2 +-
 Gems/Vegetation/Code/Source/AreaSystemComponent.cpp         | 6 +++---
 Gems/Vegetation/Code/Source/InstanceSystemComponent.cpp     | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Code/Tools/TestImpactFramework/Runtime/Code/Source/Dependency/TestImpactSourceCoveringTestsSerializer.cpp b/Code/Tools/TestImpactFramework/Runtime/Code/Source/Dependency/TestImpactSourceCoveringTestsSerializer.cpp
index 4de52e0f78..266791e05c 100644
--- a/Code/Tools/TestImpactFramework/Runtime/Code/Source/Dependency/TestImpactSourceCoveringTestsSerializer.cpp
+++ b/Code/Tools/TestImpactFramework/Runtime/Code/Source/Dependency/TestImpactSourceCoveringTestsSerializer.cpp
@@ -50,8 +50,8 @@ namespace TestImpact
         AZStd::vector<AZStd::string> coveringTests;
         sourceCoveringTests.reserve(1U << 16); // Reserve for approx. 65k source files
         const AZStd::string delim = "\n";
-        auto start = 0U;
-        auto end = sourceCoveringTestsListString.find(delim);
+        size_t start = 0U;
+        size_t end = sourceCoveringTestsListString.find(delim);
 
         while (end != AZStd::string::npos)
         {
diff --git a/Gems/AWSMetrics/Code/Source/MetricsManager.cpp b/Gems/AWSMetrics/Code/Source/MetricsManager.cpp
index 025ebe212c..5c4d910658 100644
--- a/Gems/AWSMetrics/Code/Source/MetricsManager.cpp
+++ b/Gems/AWSMetrics/Code/Source/MetricsManager.cpp
@@ -256,7 +256,7 @@ namespace AWSMetrics
                 }
 
                 m_globalStats.m_numSuccesses++;
-                m_globalStats.m_sendSizeInBytes += static_cast<AZStd::atomic<uint32_t>::value_type>(metricsEvent.GetSizeInBytes());
+                m_globalStats.m_sendSizeInBytes += static_cast<uint32_t>(metricsEvent.GetSizeInBytes());
             }
             else
             {
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderAsset.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderAsset.cpp
index 1436e62d7f..f2d82918ea 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderAsset.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderAsset.cpp
@@ -516,7 +516,7 @@ namespace AZ
         SupervariantIndex ShaderAsset::GetSupervariantIndexInternal(AZ::Name supervariantName) const
         {
             const auto& supervariants = GetCurrentShaderApiData().m_supervariants;
-            const uint32_t supervariantCount = supervariants.size();
+            const uint32_t supervariantCount = static_cast<uint32_t>(supervariants.size());
             for (uint32_t index = 0; index < supervariantCount; ++index)
             {
                 if (supervariants[index].m_name == supervariantName)
diff --git a/Gems/Vegetation/Code/Source/AreaSystemComponent.cpp b/Gems/Vegetation/Code/Source/AreaSystemComponent.cpp
index f5153a37b2..7ce1a2c0a3 100644
--- a/Gems/Vegetation/Code/Source/AreaSystemComponent.cpp
+++ b/Gems/Vegetation/Code/Source/AreaSystemComponent.cpp
@@ -1010,7 +1010,7 @@ namespace Vegetation
 
         if (m_debugData)
         {
-            m_debugData->m_areaTaskQueueCount.store(static_cast<AZStd::atomic_int::value_type>(m_vegetationThreadTasks.size()), AZStd::memory_order_relaxed);
+            m_debugData->m_areaTaskQueueCount.store(static_cast<int>(m_vegetationThreadTasks.size()), AZStd::memory_order_relaxed);
         }
     }
 
@@ -1025,8 +1025,8 @@ namespace Vegetation
 
             if (m_debugData)
             {
-                m_debugData->m_areaTaskQueueCount.store(static_cast<AZStd::atomic_int::value_type>(m_vegetationThreadTasks.size()), AZStd::memory_order_relaxed);
-                m_debugData->m_areaTaskActiveCount.store(static_cast<AZStd::atomic_int::value_type>(tasks.size()), AZStd::memory_order_relaxed);
+                m_debugData->m_areaTaskQueueCount.store(static_cast<int>(m_vegetationThreadTasks.size()), AZStd::memory_order_relaxed);
+                m_debugData->m_areaTaskActiveCount.store(static_cast<int>(tasks.size()), AZStd::memory_order_relaxed);
             }
         }
 
diff --git a/Gems/Vegetation/Code/Source/InstanceSystemComponent.cpp b/Gems/Vegetation/Code/Source/InstanceSystemComponent.cpp
index efdebcaff8..74fb2696ea 100644
--- a/Gems/Vegetation/Code/Source/InstanceSystemComponent.cpp
+++ b/Gems/Vegetation/Code/Source/InstanceSystemComponent.cpp
@@ -483,7 +483,7 @@ namespace Vegetation
             AZStd::lock_guard<decltype(m_instanceMapMutex)> scopedLock(m_instanceMapMutex);
             AZ_Assert(m_instanceMap.find(instanceData.m_instanceId) == m_instanceMap.end(), "InstanceId %llu is already in use!", instanceData.m_instanceId);
             m_instanceMap[instanceData.m_instanceId] = AZStd::make_pair(instanceData.m_descriptorPtr, opaqueInstanceData);
-            m_instanceCount = static_cast<AZStd::atomic_int::value_type>(m_instanceMap.size());
+            m_instanceCount = static_cast<int>(m_instanceMap.size());
         }
     }
 
@@ -503,7 +503,7 @@ namespace Vegetation
                 opaqueInstanceData = instanceItr->second.second;
                 m_instanceMap.erase(instanceItr);
             }
-            m_instanceCount = static_cast<AZStd::atomic_int::value_type>(m_instanceMap.size());
+            m_instanceCount = static_cast<int>(m_instanceMap.size());
         }
 
         if (opaqueInstanceData)