merging from development + fixing linux

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
monroegm-disable-blank-issue-2
pappeste 5 years ago committed by Esteban Papp
parent f6679cc05f
commit f02957c140

@ -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
{

@ -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);
}
}

@ -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)

Loading…
Cancel
Save