From aecb4a4eea393eb45671e9eee9429f4525ab711a Mon Sep 17 00:00:00 2001
From: pappeste <pappeste@amazon.com>
Date: Fri, 18 Jun 2021 16:20:59 -0700
Subject: [PATCH] =?UTF-8?q?=EF=BB=BFVegetation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
---
 Gems/Vegetation/Code/Source/AreaSystemComponent.cpp     | 6 +++---
 Gems/Vegetation/Code/Source/InstanceSystemComponent.cpp | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gems/Vegetation/Code/Source/AreaSystemComponent.cpp b/Gems/Vegetation/Code/Source/AreaSystemComponent.cpp
index 7ce1a2c0a3..f5153a37b2 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<int>(m_vegetationThreadTasks.size()), AZStd::memory_order_relaxed);
+            m_debugData->m_areaTaskQueueCount.store(static_cast<AZStd::atomic_int::value_type>(m_vegetationThreadTasks.size()), AZStd::memory_order_relaxed);
         }
     }
 
@@ -1025,8 +1025,8 @@ namespace Vegetation
 
             if (m_debugData)
             {
-                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);
+                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);
             }
         }
 
diff --git a/Gems/Vegetation/Code/Source/InstanceSystemComponent.cpp b/Gems/Vegetation/Code/Source/InstanceSystemComponent.cpp
index 74fb2696ea..efdebcaff8 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<int>(m_instanceMap.size());
+            m_instanceCount = static_cast<AZStd::atomic_int::value_type>(m_instanceMap.size());
         }
     }
 
@@ -503,7 +503,7 @@ namespace Vegetation
                 opaqueInstanceData = instanceItr->second.second;
                 m_instanceMap.erase(instanceItr);
             }
-            m_instanceCount = static_cast<int>(m_instanceMap.size());
+            m_instanceCount = static_cast<AZStd::atomic_int::value_type>(m_instanceMap.size());
         }
 
         if (opaqueInstanceData)