From d4f0fead9e014f14e1435281f91fc7a48d02d6a1 Mon Sep 17 00:00:00 2001
From: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Date: Tue, 9 Apr 2019 14:08:06 +0100
Subject: IVGCVSW-2947 Remove boost dependency from include/TypesUtils.hpp

!android-nn-driver:968

Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Change-Id: I03ccb4842b060a9893567542bfcadc180bbc7311
---
 src/backends/reference/workloads/BaseIterator.hpp              | 2 +-
 src/backends/reference/workloads/DetectionPostProcess.cpp      | 1 +
 src/backends/reference/workloads/Gather.cpp                    | 2 ++
 src/backends/reference/workloads/RefDebugWorkload.cpp          | 2 +-
 src/backends/reference/workloads/RefElementwiseWorkload.cpp    | 3 +--
 src/backends/reference/workloads/RefGatherWorkload.cpp         | 2 +-
 src/backends/reference/workloads/RefPadWorkload.cpp            | 2 +-
 src/backends/reference/workloads/RefPermuteWorkload.cpp        | 2 +-
 src/backends/reference/workloads/RefSpaceToBatchNdWorkload.cpp | 2 +-
 src/backends/reference/workloads/RefStridedSliceWorkload.cpp   | 2 +-
 10 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'src/backends/reference/workloads')

diff --git a/src/backends/reference/workloads/BaseIterator.hpp b/src/backends/reference/workloads/BaseIterator.hpp
index 955d7f2185..3439e41b48 100644
--- a/src/backends/reference/workloads/BaseIterator.hpp
+++ b/src/backends/reference/workloads/BaseIterator.hpp
@@ -6,7 +6,7 @@
 #pragma once
 
 #include <armnn/ArmNN.hpp>
-#include <TypeUtils.hpp>
+#include <ResolveType.hpp>
 
 namespace armnn
 {
diff --git a/src/backends/reference/workloads/DetectionPostProcess.cpp b/src/backends/reference/workloads/DetectionPostProcess.cpp
index 6868180b0b..d3790f22ab 100644
--- a/src/backends/reference/workloads/DetectionPostProcess.cpp
+++ b/src/backends/reference/workloads/DetectionPostProcess.cpp
@@ -7,6 +7,7 @@
 
 #include <armnn/ArmNN.hpp>
 
+#include <boost/assert.hpp>
 #include <boost/numeric/conversion/cast.hpp>
 
 #include <algorithm>
diff --git a/src/backends/reference/workloads/Gather.cpp b/src/backends/reference/workloads/Gather.cpp
index b195003e04..45491c7f52 100644
--- a/src/backends/reference/workloads/Gather.cpp
+++ b/src/backends/reference/workloads/Gather.cpp
@@ -9,6 +9,8 @@
 
 #include <backendsCommon/WorkloadData.hpp>
 
+#include <boost/numeric/conversion/cast.hpp>
+
 namespace armnn
 {
 
diff --git a/src/backends/reference/workloads/RefDebugWorkload.cpp b/src/backends/reference/workloads/RefDebugWorkload.cpp
index 3da925913a..64b1b1c593 100644
--- a/src/backends/reference/workloads/RefDebugWorkload.cpp
+++ b/src/backends/reference/workloads/RefDebugWorkload.cpp
@@ -7,7 +7,7 @@
 #include "Debug.hpp"
 #include "RefWorkloadUtils.hpp"
 
-#include <TypeUtils.hpp>
+#include <ResolveType.hpp>
 
 #include <cstring>
 
diff --git a/src/backends/reference/workloads/RefElementwiseWorkload.cpp b/src/backends/reference/workloads/RefElementwiseWorkload.cpp
index 535adca0d7..cbacd9c21e 100644
--- a/src/backends/reference/workloads/RefElementwiseWorkload.cpp
+++ b/src/backends/reference/workloads/RefElementwiseWorkload.cpp
@@ -11,8 +11,7 @@
 #include "Profiling.hpp"
 #include "RefWorkloadUtils.hpp"
 #include "StringMapping.hpp"
-#include "TypeUtils.hpp"
-
+#include <ResolveType.hpp>
 #include <vector>
 
 namespace armnn
diff --git a/src/backends/reference/workloads/RefGatherWorkload.cpp b/src/backends/reference/workloads/RefGatherWorkload.cpp
index 49b37cb1ac..bca3f18796 100644
--- a/src/backends/reference/workloads/RefGatherWorkload.cpp
+++ b/src/backends/reference/workloads/RefGatherWorkload.cpp
@@ -8,7 +8,7 @@
 #include "Gather.hpp"
 #include "Profiling.hpp"
 #include "RefWorkloadUtils.hpp"
-#include "TypeUtils.hpp"
+#include <ResolveType.hpp>
 
 namespace armnn
 {
diff --git a/src/backends/reference/workloads/RefPadWorkload.cpp b/src/backends/reference/workloads/RefPadWorkload.cpp
index b41c2de9af..16032e7c77 100644
--- a/src/backends/reference/workloads/RefPadWorkload.cpp
+++ b/src/backends/reference/workloads/RefPadWorkload.cpp
@@ -10,7 +10,7 @@
 
 #include "Profiling.hpp"
 
-#include "TypeUtils.hpp"
+#include <ResolveType.hpp>
 
 #include <vector>
 
diff --git a/src/backends/reference/workloads/RefPermuteWorkload.cpp b/src/backends/reference/workloads/RefPermuteWorkload.cpp
index 9ca16425fa..9e44d162e2 100644
--- a/src/backends/reference/workloads/RefPermuteWorkload.cpp
+++ b/src/backends/reference/workloads/RefPermuteWorkload.cpp
@@ -7,7 +7,7 @@
 #include "RefWorkloadUtils.hpp"
 
 #include <Permute.hpp>
-#include "TypeUtils.hpp"
+#include <ResolveType.hpp>
 
 namespace armnn
 {
diff --git a/src/backends/reference/workloads/RefSpaceToBatchNdWorkload.cpp b/src/backends/reference/workloads/RefSpaceToBatchNdWorkload.cpp
index fb98118536..4d2bb05daa 100644
--- a/src/backends/reference/workloads/RefSpaceToBatchNdWorkload.cpp
+++ b/src/backends/reference/workloads/RefSpaceToBatchNdWorkload.cpp
@@ -7,7 +7,7 @@
 #include "SpaceToBatchNd.hpp"
 
 #include "RefWorkloadUtils.hpp"
-#include "TypeUtils.hpp"
+#include <ResolveType.hpp>
 
 namespace armnn
 {
diff --git a/src/backends/reference/workloads/RefStridedSliceWorkload.cpp b/src/backends/reference/workloads/RefStridedSliceWorkload.cpp
index 26a878e02f..bcc3520f45 100644
--- a/src/backends/reference/workloads/RefStridedSliceWorkload.cpp
+++ b/src/backends/reference/workloads/RefStridedSliceWorkload.cpp
@@ -7,7 +7,7 @@
 #include "StridedSlice.hpp"
 
 #include "RefWorkloadUtils.hpp"
-#include "TypeUtils.hpp"
+#include <ResolveType.hpp>
 
 namespace armnn
 {
-- 
cgit v1.2.1