From ac2770a4bb6461bfbddec928bb6208f26f898f02 Mon Sep 17 00:00:00 2001
From: Narumol Prangnawarat <narumol.prangnawarat@arm.com>
Date: Wed, 1 Apr 2020 16:51:23 +0100
Subject: IVGCVSW-4485 Remove Boost assert

 * Change boost assert to armnn assert
 * Change include file to armnn assert
 * Fix ARMNN_ASSERT_MSG issue with multiple conditions
 * Change BOOST_ASSERT to BOOST_TEST where appropriate
 * Remove unused include statements

Signed-off-by: Narumol Prangnawarat <narumol.prangnawarat@arm.com>
Change-Id: I5d0fa3a37b7c1c921216de68f0073aa34702c9ff
---
 include/armnnUtils/DataLayoutIndexed.hpp | 10 +++++-----
 include/armnnUtils/TensorUtils.hpp       |  2 --
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'include/armnnUtils')

diff --git a/include/armnnUtils/DataLayoutIndexed.hpp b/include/armnnUtils/DataLayoutIndexed.hpp
index c6701f7d5c..e377cc5a31 100644
--- a/include/armnnUtils/DataLayoutIndexed.hpp
+++ b/include/armnnUtils/DataLayoutIndexed.hpp
@@ -8,7 +8,7 @@
 #include <armnn/Types.hpp>
 #include <armnn/Tensor.hpp>
 
-#include <boost/assert.hpp>
+#include <armnn/utility/Assert.hpp>
 
 namespace armnnUtils
 {
@@ -28,12 +28,12 @@ public:
                                  unsigned int batchIndex, unsigned int channelIndex,
                                  unsigned int heightIndex, unsigned int widthIndex) const
     {
-        BOOST_ASSERT( batchIndex < shape[0] || ( shape[0] == 0 && batchIndex == 0 ) );
-        BOOST_ASSERT( channelIndex < shape[m_ChannelsIndex] ||
+        ARMNN_ASSERT( batchIndex < shape[0] || ( shape[0] == 0 && batchIndex == 0 ) );
+        ARMNN_ASSERT( channelIndex < shape[m_ChannelsIndex] ||
                     ( shape[m_ChannelsIndex] == 0 && channelIndex == 0) );
-        BOOST_ASSERT( heightIndex < shape[m_HeightIndex] ||
+        ARMNN_ASSERT( heightIndex < shape[m_HeightIndex] ||
                     ( shape[m_HeightIndex] == 0 && heightIndex == 0) );
-        BOOST_ASSERT( widthIndex < shape[m_WidthIndex] ||
+        ARMNN_ASSERT( widthIndex < shape[m_WidthIndex] ||
                     ( shape[m_WidthIndex] == 0 && widthIndex == 0) );
 
         /// Offset the given indices appropriately depending on the data layout
diff --git a/include/armnnUtils/TensorUtils.hpp b/include/armnnUtils/TensorUtils.hpp
index fbfb8f4e1e..cc5f780f10 100644
--- a/include/armnnUtils/TensorUtils.hpp
+++ b/include/armnnUtils/TensorUtils.hpp
@@ -7,8 +7,6 @@
 
 #include <armnn/TypesUtils.hpp>
 
-#include <boost/assert.hpp>
-
 namespace armnnUtils
 {
 armnn::TensorShape GetTensorShape(unsigned int numberOfBatches,
-- 
cgit v1.2.1