commit 6d9f5c57fe80b3b3c08294ddd52062e107151a15
author James Ward <james.ward@arm.com> Mon Sep 28 11:56:35 2020 +0100
committer James Ward <james.ward@arm.com> Wed Sep 30 17:13:58 2020 +0000
tree a5aeca515a6f81545d82939ca4031df8677aed12
parent 156113cee2b869810092b42579c31c3b1fd910c5

IVGCVSW-4519 Remove Boost Variant and apply_visitor variant

  * replace boost::variant with mapbox::util::variant
  * replace boost::apply_visitor with mapbox::util::apply_visitor
  * replace boost::get with mapbox::util::get

Signed-off-by: James Ward <james.ward@arm.com>
Change-Id: I38460cabbcd5e56d4d61151bfe3dcb5681ce696e

tests/ImageTensorGenerator/ImageTensorGenerator.cpp

diff --git a/tests/ImageTensorGenerator/ImageTensorGenerator.cpp b/tests/ImageTensorGenerator/ImageTensorGenerator.cpp
index 568ba1e..04419d5 100644
--- a/tests/ImageTensorGenerator/ImageTensorGenerator.cpp
+++ b/tests/ImageTensorGenerator/ImageTensorGenerator.cpp
@@ -10,7 +10,7 @@
 #include <Filesystem.hpp>
 
 #include <boost/program_options.hpp>
-#include <boost/variant.hpp>
+#include <mapbox/variant.hpp>
 
 #include <algorithm>
 #include <fstream>
@@ -259,7 +259,7 @@
     const unsigned int batchSize = 1;
     const armnn::DataLayout outputLayout(cmdline.GetLayout());
 
-    using TContainer = boost::variant<std::vector<float>, std::vector<int>, std::vector<uint8_t>>;
+    using TContainer = mapbox::util::variant<std::vector<float>, std::vector<int>, std::vector<uint8_t>>;
     std::vector<TContainer> imageDataContainers;
     const NormalizationParameters& normParams = GetNormalizationParameters(modelFormat, outputType);
     try
@@ -291,8 +291,11 @@
     imageTensorFile.open(outputPath, std::ofstream::out);
     if (imageTensorFile.is_open())
     {
-        boost::apply_visitor([&imageTensorFile](auto&& imageData) { WriteImageTensorImpl(imageData, imageTensorFile); },
-                             imageDataContainers[0]);
+        mapbox::util::apply_visitor(
+            [&imageTensorFile](auto&& imageData){ WriteImageTensorImpl(imageData,imageTensorFile); },
+            imageDataContainers[0]
+            );
+
         if (!imageTensorFile)
         {
             ARMNN_LOG(fatal) << "Failed to write to output file" << outputPath;