IVGCVSW-4482 Remove boost::ignore_unused

!referencetests:229377

Signed-off-by: Jan Eilers <jan.eilers@arm.com>
Change-Id: Ia9b360b4a057fe7bbce5b268092627c09a0dba82

7 files changed, 19 insertions, 13 deletions

diff --git a/tests/DeepSpeechV1InferenceTest.hpp b/tests/DeepSpeechV1InferenceTest.hpp
index ac28bbbcd4..07b55d2ab8 100644
--- a/tests/DeepSpeechV1InferenceTest.hpp
+++ b/tests/DeepSpeechV1InferenceTest.hpp
@@ -7,8 +7,9 @@
 #include "InferenceTest.hpp"
 #include "DeepSpeechV1Database.hpp"
 
+#include <armnn/utility/IgnoreUnused.hpp>
+
 #include <boost/assert.hpp>
-#include <boost/core/ignore_unused.hpp>
 #include <boost/numeric/conversion/cast.hpp>
 #include <boost/test/tools/floating_point_comparison.hpp>
 
@@ -37,7 +38,7 @@ public:
 
     TestCaseResult ProcessResult(const InferenceTestOptions& options) override
     {
-        boost::ignore_unused(options);
+        armnn::IgnoreUnused(options);
         const std::vector<float>& output1 = boost::get<std::vector<float>>(this->GetOutputs()[0]); // logits
         BOOST_ASSERT(output1.size() == k_OutputSize1);
 
diff --git a/tests/InferenceTest.hpp b/tests/InferenceTest.hpp
index 6423d1c7ff..68c168f126 100644
--- a/tests/InferenceTest.hpp
+++ b/tests/InferenceTest.hpp
@@ -4,12 +4,13 @@
 //
 #pragma once
 
+#include "InferenceModel.hpp"
+
 #include <armnn/ArmNN.hpp>
 #include <armnn/Logging.hpp>
 #include <armnn/TypesUtils.hpp>
-#include "InferenceModel.hpp"
+#include <armnn/utility/IgnoreUnused.hpp>
 
-#include <boost/core/ignore_unused.hpp>
 #include <boost/program_options.hpp>
 
 
@@ -93,11 +94,11 @@ public:
 
     virtual void AddCommandLineOptions(boost::program_options::options_description& options)
     {
-        boost::ignore_unused(options);
+        IgnoreUnused(options);
     };
     virtual bool ProcessCommandLineOptions(const InferenceTestOptions &commonOptions)
     {
-        boost::ignore_unused(commonOptions);
+        IgnoreUnused(commonOptions);
         return true;
     };
     virtual std::unique_ptr<IInferenceTestCase> GetTestCase(unsigned int testCaseId) = 0;
diff --git a/tests/InferenceTest.inl b/tests/InferenceTest.inl
index c05e70d9f7..5b9b45a4a2 100644
--- a/tests/InferenceTest.inl
+++ b/tests/InferenceTest.inl
@@ -79,7 +79,7 @@ struct ClassifierResultProcessor : public boost::static_visitor<>
 
     void operator()(const std::vector<int>& values)
     {
-        boost::ignore_unused(values);
+        IgnoreUnused(values);
         BOOST_ASSERT_MSG(false, "Non-float predictions output not supported.");
     }
 
diff --git a/tests/InferenceTestImage.cpp b/tests/InferenceTestImage.cpp
index 92c67ae225..83c5cce346 100644
--- a/tests/InferenceTestImage.cpp
+++ b/tests/InferenceTestImage.cpp
@@ -4,9 +4,9 @@
 //
 #include "InferenceTestImage.hpp"
 
-#include <boost/core/ignore_unused.hpp>
+#include <armnn/utility/IgnoreUnused.hpp>
+
 #include <boost/format.hpp>
-#include <boost/core/ignore_unused.hpp>
 #include <boost/numeric/conversion/cast.hpp>
 
 #include <array>
@@ -314,7 +314,7 @@ std::vector<float> GetImageDataInArmNnLayoutAsNormalizedFloats(ImageChannelLayou
     return GetImageDataInArmNnLayoutAsFloats(layout, image,
         [](ImageChannel channel, float value)
         {
-            boost::ignore_unused(channel);
+            armnn::IgnoreUnused(channel);
             return value / 255.f;
         });
 }
diff --git a/tests/MobileNetSsdInferenceTest.hpp b/tests/MobileNetSsdInferenceTest.hpp
index c99844b6bb..a26712c511 100644
--- a/tests/MobileNetSsdInferenceTest.hpp
+++ b/tests/MobileNetSsdInferenceTest.hpp
@@ -7,6 +7,8 @@
 #include "InferenceTest.hpp"
 #include "MobileNetSsdDatabase.hpp"
 
+#include <armnn/utility/IgnoreUnused.hpp>
+
 #include <boost/assert.hpp>
 #include <boost/numeric/conversion/cast.hpp>
 #include <boost/test/tools/floating_point_comparison.hpp>
@@ -33,7 +35,7 @@ public:
 
     TestCaseResult ProcessResult(const InferenceTestOptions& options) override
     {
-        boost::ignore_unused(options);
+        armnn::IgnoreUnused(options);
 
         const std::vector<float>& output1 = boost::get<std::vector<float>>(this->GetOutputs()[0]); // bounding boxes
         BOOST_ASSERT(output1.size() == k_OutputSize1);
diff --git a/tests/NetworkExecutionUtils/NetworkExecutionUtils.hpp b/tests/NetworkExecutionUtils/NetworkExecutionUtils.hpp
index d7e9275916..4d996fd401 100644
--- a/tests/NetworkExecutionUtils/NetworkExecutionUtils.hpp
+++ b/tests/NetworkExecutionUtils/NetworkExecutionUtils.hpp
@@ -751,7 +751,7 @@ int RunCsvTest(const armnnUtils::CsvRow &csvRow, const std::shared_ptr<armnn::IR
                const bool enableProfiling, const bool enableFp16TurboMode, const double& thresholdTime,
                const bool printIntermediate, bool enableLayerDetails = false, bool parseUnuspported = false)
 {
-    boost::ignore_unused(runtime);
+    IgnoreUnused(runtime);
     std::string modelFormat;
     std::string modelPath;
     std::string inputNames;
diff --git a/tests/YoloInferenceTest.hpp b/tests/YoloInferenceTest.hpp
index 16d0355d9d..4190e72365 100644
--- a/tests/YoloInferenceTest.hpp
+++ b/tests/YoloInferenceTest.hpp
@@ -7,6 +7,8 @@
 #include "InferenceTest.hpp"
 #include "YoloDatabase.hpp"
 
+#include <armnn/utility/IgnoreUnused.hpp>
+
 #include <algorithm>
 #include <array>
 #include <utility>
@@ -32,7 +34,7 @@ public:
 
     virtual TestCaseResult ProcessResult(const InferenceTestOptions& options) override
     {
-        boost::ignore_unused(options);
+        armnn::IgnoreUnused(options);
 
         using Boost3dArray = boost::multi_array<float, 3>;