From 40d2741b459fb7d55ff034d615678848a8e0af7c Mon Sep 17 00:00:00 2001
From: Francis Murtagh <francis.murtagh@arm.com>
Date: Thu, 28 Oct 2021 11:11:35 +0100
Subject: IVGCVSW-6513: Compilation failure in armnn-mobilenet-quant in
 ML-Examples

 * Move TContainer to armnnUtils library

Signed-off-by: Francis Murtagh <francis.murtagh@arm.com>
Change-Id: I3c0f895d11b66f6ee224ac689a19d0477f990b98
---
 include/armnn/Utils.hpp           |  8 +-------
 include/armnnUtils/TContainer.hpp | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 7 deletions(-)
 create mode 100644 include/armnnUtils/TContainer.hpp

(limited to 'include')

diff --git a/include/armnn/Utils.hpp b/include/armnn/Utils.hpp
index 533117c5d9..7d442ba4b5 100644
--- a/include/armnn/Utils.hpp
+++ b/include/armnn/Utils.hpp
@@ -4,9 +4,8 @@
 //
 #pragma once
 
-#include "armnn/TypesUtils.hpp"
+#include <armnn/TypesUtils.hpp>
 
-#include <mapbox/variant.hpp>
 #include <iostream>
 
 namespace armnn
@@ -42,9 +41,4 @@ bool NeonDetected();
 
 const std::string GetVersion();
 
-// Standard definition of TContainer used by ArmNN, use this definition or add alternative definitions here instead of
-// defining your own.
-using TContainer =
-        mapbox::util::variant<std::vector<float>, std::vector<int>, std::vector<unsigned char>, std::vector<int8_t>>;
-
 } // namespace armnn
diff --git a/include/armnnUtils/TContainer.hpp b/include/armnnUtils/TContainer.hpp
new file mode 100644
index 0000000000..a55f9df488
--- /dev/null
+++ b/include/armnnUtils/TContainer.hpp
@@ -0,0 +1,20 @@
+//
+// Copyright © 2020 Arm Ltd. All rights reserved.
+// SPDX-License-Identifier: MIT
+//
+
+#pragma once
+
+#include <armnn/TypesUtils.hpp>
+
+#include <mapbox/variant.hpp>
+
+namespace armnnUtils
+{
+
+// Standard definition of TContainer used by ArmNN, use this definition or add alternative definitions here instead of
+// defining your own.
+    using TContainer =
+    mapbox::util::variant<std::vector<float>, std::vector<int>, std::vector<unsigned char>, std::vector<int8_t>>;
+
+} // namespace armnnUtils
-- 
cgit v1.2.1