commit 93667b1d7c361df68bdb1d733f17aba3ba34e046
author Rob Hughes <robert.hughes@arm.com> Mon Sep 23 16:24:05 2019 +0100
committer Rob Hughes <robert.hughes@arm.com> Mon Sep 23 16:51:15 2019 +0100
tree 22375370a8fd2e94a0b9385f1429f15cebb71623
parent ce2d9d13fbc0c8efd83dfb411c045553f87331f9

Replace uses of non-standard C++:

* Variable-length array replaced with std::vector
* "and" replaced with "&&" (OK, this one is standard but MSVC doesn't
like it and it's inconsistent with the rest of the codebase)
* Replace u_int8_t with uint8_t

Change-Id: I7b968a2cfa85a5492a2a547364464c594efb067b
Signed-off-by: Rob Hughes <robert.hughes@arm.com>

src/backends/backendsCommon/WorkloadUtils.cpp

diff --git a/src/backends/backendsCommon/WorkloadUtils.cpp b/src/backends/backendsCommon/WorkloadUtils.cpp
index 3185ba0..9e008ca 100644
--- a/src/backends/backendsCommon/WorkloadUtils.cpp
+++ b/src/backends/backendsCommon/WorkloadUtils.cpp
@@ -82,7 +82,7 @@
             break;
     }
 
-    DataType weightAclOrder[height*width*inputChannels*multiplier];
+    std::vector<DataType> weightAclOrder(height*width*inputChannels*multiplier);
     unsigned int destinationWeightsChannel;
     unsigned int totalChannels = inputChannels * multiplier;
     unsigned int channelSize   = height * width;
@@ -105,7 +105,7 @@
         }
     }
 
-    ::memcpy(permuteBuffer, weightAclOrder, weightHandle.GetInfo().GetNumBytes());
+    ::memcpy(permuteBuffer, weightAclOrder.data(), weightHandle.GetInfo().GetNumBytes());
     return ConstTensor(weightHandle.GetInfo(), permuteBuffer);
 }
 
@@ -158,7 +158,7 @@
     ConstTensor weightPermuted = PermuteTensor(weightTensor, permutationVector, permuteBuffer);
 
     // Shuffle the weights data to obtain the channel order needed used by Acl
-    if (multiplier > 1 and inputChannels > 1 and dataLayout == DataLayout::NCHW)
+    if (multiplier > 1 && inputChannels > 1 && dataLayout == DataLayout::NCHW)
     {
         switch (weightPermuted.GetDataType())
         {