Merge branch 'development' into cmake/AddressSanitizer
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
@@ -95,7 +95,7 @@ namespace AZ
|
||||
auto printElement = [&os, &mat](int64_t row, int64_t col) -> std::ostream&
|
||||
{
|
||||
const std::streamsize width = 10;
|
||||
os << std::setw(width) << std::fixed << mat.GetElement(row, col);
|
||||
os << std::setw(width) << std::fixed << mat.GetElement(static_cast<int32_t>(row), static_cast<int32_t>(col));
|
||||
return os;
|
||||
};
|
||||
|
||||
|
||||
@@ -1736,7 +1736,7 @@ namespace Benchmark
|
||||
std::numeric_limits<AZ::s8>::max());
|
||||
std::generate(m_randomPriorities.begin(), m_randomPriorities.end(), [&randomPriorityDistribution, &randomPriorityGenerator]()
|
||||
{
|
||||
return randomPriorityDistribution(randomPriorityGenerator);
|
||||
return static_cast<AZ::s8>(randomPriorityDistribution(randomPriorityGenerator));
|
||||
});
|
||||
|
||||
// Generate some random depths
|
||||
|
||||
@@ -94,7 +94,7 @@ namespace UnitTest
|
||||
float testStoreValues[4] = { 0.0f, 0.0f, 0.0f, 0.0f };
|
||||
VectorType::StoreUnaligned(testStoreValues, result);
|
||||
|
||||
for (int32_t i = 0; i < VectorType::ElementCount; ++i)
|
||||
for (uint32_t i = 0; i < VectorType::ElementCount; ++i)
|
||||
{
|
||||
if (i == replaceIndex)
|
||||
{
|
||||
|
||||
@@ -297,7 +297,7 @@ AZ_POP_DISABLE_WARNING
|
||||
// the overflow guard is generated out of rand, so we set a fixed seed before doing the allocation
|
||||
// to get a deterministic guard
|
||||
srand(0);
|
||||
const unsigned char expectedInitialGuard = rand();
|
||||
const unsigned char expectedInitialGuard = static_cast<unsigned char>(rand());
|
||||
|
||||
srand(0);
|
||||
TestClass<16>* someObject = aznew TestClass<16>();
|
||||
|
||||
@@ -32,12 +32,12 @@ namespace JsonSerializationTests
|
||||
|
||||
AZStd::shared_ptr<NumberType> CreateDefaultInstance() override
|
||||
{
|
||||
return AZStd::make_shared<NumberType>(0);
|
||||
return AZStd::make_shared<NumberType>(NumberType(0));
|
||||
}
|
||||
|
||||
AZStd::shared_ptr<NumberType> CreateFullySetInstance() override
|
||||
{
|
||||
return AZStd::make_shared<NumberType>(4);
|
||||
return AZStd::make_shared<NumberType>(NumberType(4));
|
||||
}
|
||||
|
||||
AZStd::string_view GetJsonForFullySetInstance() override
|
||||
|
||||
@@ -225,7 +225,6 @@ namespace JsonSerializationTests
|
||||
static_assert((RowCount >= 3 && RowCount <= 4) && (ColumnCount >= 3 && ColumnCount <= 4),
|
||||
"Only matrix 3x3, 3x4 or 4x4 are supported by this test.");
|
||||
}
|
||||
return "{}";
|
||||
}
|
||||
|
||||
void ConfigureFeatures(JsonSerializerConformityTestDescriptorFeatures& features) override
|
||||
|
||||
Reference in New Issue
Block a user