commit e950db6368788595cc6152e3554bb593acc2a6a1
author Matteo Martincigh <matteo.martincigh@arm.com> Tue Nov 20 09:34:27 2018 +0000
committer Matteo Martincigh <matteo.martincigh@arm.com> Tue Nov 20 09:35:53 2018 +0000
tree e7b80013cee2f56116c055320571e4c597e0af2b
parent dea72860f9b41242d9c903d3e576a1358e459d49

IVGCVSW-2043 Merger using ACL for innermost concat axis

 * Fixed unsigned to signed conversion error that was
   breaking master

Change-Id: I08d79d9bf131eb46ea0495371160698ab59c1721

src/armnn/layers/MergerLayer.cpp

diff --git a/src/armnn/layers/MergerLayer.cpp b/src/armnn/layers/MergerLayer.cpp
index 545c7e0..85dc0e7 100644
--- a/src/armnn/layers/MergerLayer.cpp
+++ b/src/armnn/layers/MergerLayer.cpp
@@ -41,7 +41,7 @@
     //are made subtensors of the output of the merger layer.
     m_OutputHandlers[0].CreateTensorHandles(factory);
 
-    signed long innerAxis = m_Param.GetNumDimensions() - m_Param.GetConcatAxis();
+    unsigned int innerAxis = m_Param.GetNumDimensions() - m_Param.GetConcatAxis();
 
     if (factory.SupportsSubTensors() && innerAxis != 1)
     {