From eb70c91a4180b1b437040b00296ff0065de6f051 Mon Sep 17 00:00:00 2001
From: Rob Hughes <robert.hughes@arm.com>
Date: Thu, 7 Oct 2021 08:53:58 +0100
Subject: Fix compile errors/warnings found on MSVC

* Fix incorrect type used for loop variable (leading to conversion warnings)
* Fix use of non-standard datatype u_int8_t

Change-Id: Ide43d504e2df259c036e38c448247636dba278ad
Signed-off-by: Rob Hughes <robert.hughes@arm.com>
---
 src/backends/backendsCommon/test/layerTests/Conv3dTestImpl.cpp | 2 +-
 src/backends/backendsCommon/test/layerTests/Conv3dTestImpl.hpp | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/backends/backendsCommon/test/layerTests/Conv3dTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/Conv3dTestImpl.cpp
index 2f02189051..259272d996 100644
--- a/src/backends/backendsCommon/test/layerTests/Conv3dTestImpl.cpp
+++ b/src/backends/backendsCommon/test/layerTests/Conv3dTestImpl.cpp
@@ -63,7 +63,7 @@ void ApplyBiasToData(std::vector<T>& v, const std::vector<B>& bias,
 
     for (uint32_t i = 0; i < bias.size(); ++i)
     {
-        for (long unsigned int j = i; j < v.size(); j+=bias.size())
+        for (size_t j = i; j < v.size(); j+=bias.size())
         {
             // Note we need to dequantize and re-quantize the image value and the bias.
             float dBias = SelectiveDequantize(bias[i], bScale, bOffset);
diff --git a/src/backends/backendsCommon/test/layerTests/Conv3dTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/Conv3dTestImpl.hpp
index 45a6786e39..a07c183c76 100644
--- a/src/backends/backendsCommon/test/layerTests/Conv3dTestImpl.hpp
+++ b/src/backends/backendsCommon/test/layerTests/Conv3dTestImpl.hpp
@@ -32,7 +32,7 @@ LayerTestResult<int8_t , 5> SimpleConvolution3d3x3x3Int8Test(
         const armnn::ITensorHandleFactory& tensorHandleFactory,
         bool biasEnabled);
 
-LayerTestResult<u_int8_t, 5> SimpleConvolution3d3x3x3Uint8Test(
+LayerTestResult<uint8_t, 5> SimpleConvolution3d3x3x3Uint8Test(
         armnn::IWorkloadFactory& workloadFactory,
         const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager,
         const armnn::ITensorHandleFactory& tensorHandleFactory,
@@ -56,7 +56,7 @@ LayerTestResult<int8_t , 5> Convolution3d2x2x2Strides3x5x5Int8Test(
         const armnn::ITensorHandleFactory& tensorHandleFactory,
         bool biasEnabled);
 
-LayerTestResult<u_int8_t, 5> Convolution3d2x2x2Strides3x5x5Uint8Test(
+LayerTestResult<uint8_t, 5> Convolution3d2x2x2Strides3x5x5Uint8Test(
         armnn::IWorkloadFactory& workloadFactory,
         const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager,
         const armnn::ITensorHandleFactory& tensorHandleFactory,
@@ -80,7 +80,7 @@ LayerTestResult<int8_t , 5> Convolution3d2x2x2Dilation2x2x2Int8Test(
         const armnn::ITensorHandleFactory& tensorHandleFactory,
         bool biasEnabled);
 
-LayerTestResult<u_int8_t, 5> Convolution3d2x2x2Dilation2x2x2Uint8Test(
+LayerTestResult<uint8_t, 5> Convolution3d2x2x2Dilation2x2x2Uint8Test(
         armnn::IWorkloadFactory& workloadFactory,
         const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager,
         const armnn::ITensorHandleFactory& tensorHandleFactory,
@@ -104,7 +104,7 @@ LayerTestResult<int8_t , 5> Convolution3dPaddingSame3x3x3Int8Test(
         const armnn::ITensorHandleFactory& tensorHandleFactory,
         bool biasEnabled);
 
-LayerTestResult<u_int8_t, 5> Convolution3dPaddingSame3x3x3Uint8Test(
+LayerTestResult<uint8_t, 5> Convolution3dPaddingSame3x3x3Uint8Test(
         armnn::IWorkloadFactory& workloadFactory,
         const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager,
         const armnn::ITensorHandleFactory& tensorHandleFactory,
-- 
cgit v1.2.1