IVGCVSW-4482 Remove boost::ignore_unused

!referencetests:229377

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

6 files changed, 24 insertions, 23 deletions

diff --git a/src/profiling/test/FileOnlyProfilingDecoratorTests.cpp b/src/profiling/test/FileOnlyProfilingDecoratorTests.cpp
index 77d4d683b6..7db42de416 100644
--- a/src/profiling/test/FileOnlyProfilingDecoratorTests.cpp
+++ b/src/profiling/test/FileOnlyProfilingDecoratorTests.cpp
@@ -8,8 +8,8 @@
 #include <ProfilingService.hpp>
 #include <Runtime.hpp>
 #include <Filesystem.hpp>
+#include <armnn/utility/IgnoreUnused.hpp>
 
-#include <boost/core/ignore_unused.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/numeric/conversion/cast.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp b/src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp
index 6a092815b2..c36867815f 100644
--- a/src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp
+++ b/src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp
@@ -5,11 +5,11 @@
 
 #include "../ProfilingConnectionDumpToFileDecorator.hpp"
 #include <Runtime.hpp>
+#include <armnn/utility/IgnoreUnused.hpp>
 
 #include <fstream>
 #include <sstream>
 
-#include <boost/core/ignore_unused.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/numeric/conversion/cast.hpp>
 #include <boost/test/unit_test.hpp>
@@ -49,14 +49,14 @@ public:
 
     bool WritePacket(const unsigned char* buffer, uint32_t length) override
     {
-        boost::ignore_unused(buffer);
-        boost::ignore_unused(length);
+        armnn::IgnoreUnused(buffer);
+        armnn::IgnoreUnused(length);
         return true;
     }
 
     Packet ReadPacket(uint32_t timeout) override
     {
-        boost::ignore_unused(timeout);
+        armnn::IgnoreUnused(timeout);
         return std::move(*m_Packet);
     }
 
diff --git a/src/profiling/test/ProfilingMocks.hpp b/src/profiling/test/ProfilingMocks.hpp
index 19aad491af..944aea6454 100644
--- a/src/profiling/test/ProfilingMocks.hpp
+++ b/src/profiling/test/ProfilingMocks.hpp
@@ -16,9 +16,9 @@
 #include <armnn/Exceptions.hpp>
 #include <armnn/Optional.hpp>
 #include <armnn/Conversion.hpp>
+#include <armnn/utility/IgnoreUnused.hpp>
 
 #include <boost/assert.hpp>
-#include <boost/core/ignore_unused.hpp>
 #include <boost/numeric/conversion/cast.hpp>
 
 #include <atomic>
@@ -128,7 +128,7 @@ public:
 
     Packet ReadPacket(uint32_t timeout) override
     {
-        boost::ignore_unused(timeout);
+        IgnoreUnused(timeout);
 
         // Simulate a delay in the reading process. The default timeout is way too long.
         std::this_thread::sleep_for(std::chrono::milliseconds(5));
@@ -162,7 +162,7 @@ class MockProfilingConnectionFactory : public IProfilingConnectionFactory
 public:
     IProfilingConnectionPtr GetProfilingConnection(const ExternalProfilingOptions& options) const override
     {
-        boost::ignore_unused(options);
+        IgnoreUnused(options);
         return std::make_unique<MockProfilingConnection>();
     }
 };
@@ -399,7 +399,7 @@ public:
 
     void SendCounterDirectoryPacket(const ICounterDirectory& counterDirectory) override
     {
-        boost::ignore_unused(counterDirectory);
+        IgnoreUnused(counterDirectory);
 
         std::string message("SendCounterDirectoryPacket");
         unsigned int reserved = 0;
@@ -411,7 +411,7 @@ public:
     void SendPeriodicCounterCapturePacket(uint64_t timestamp,
                                           const std::vector<CounterValue>& values) override
     {
-        boost::ignore_unused(timestamp, values);
+        IgnoreUnused(timestamp, values);
 
         std::string message("SendPeriodicCounterCapturePacket");
         unsigned int reserved = 0;
@@ -423,7 +423,7 @@ public:
     void SendPeriodicCounterSelectionPacket(uint32_t capturePeriod,
                                             const std::vector<uint16_t>& selectedCounterIds) override
     {
-        boost::ignore_unused(capturePeriod, selectedCounterIds);
+        IgnoreUnused(capturePeriod, selectedCounterIds);
 
         std::string message("SendPeriodicCounterSelectionPacket");
         unsigned int reserved = 0;
@@ -513,7 +513,7 @@ public:
                                    const armnn::Optional<uint16_t>& deviceUid = armnn::EmptyOptional(),
                                    const armnn::Optional<uint16_t>& counterSetUid = armnn::EmptyOptional())
     {
-        boost::ignore_unused(backendId);
+        IgnoreUnused(backendId);
 
         // Get the number of cores from the argument only
         uint16_t deviceCores = numberOfCores.has_value() ? numberOfCores.value() : 0;
@@ -597,19 +597,19 @@ public:
 
     const Device* GetDevice(uint16_t uid) const override
     {
-        boost::ignore_unused(uid);
+        IgnoreUnused(uid);
         return nullptr; // Not used by the unit tests
     }
 
     const CounterSet* GetCounterSet(uint16_t uid) const override
     {
-        boost::ignore_unused(uid);
+        IgnoreUnused(uid);
         return nullptr; // Not used by the unit tests
     }
 
     const Counter* GetCounter(uint16_t uid) const override
     {
-        boost::ignore_unused(uid);
+        IgnoreUnused(uid);
         return nullptr; // Not used by the unit tests
     }
 
diff --git a/src/profiling/test/ProfilingTests.cpp b/src/profiling/test/ProfilingTests.cpp
index 3dab93d9b8..0e91696af8 100644
--- a/src/profiling/test/ProfilingTests.cpp
+++ b/src/profiling/test/ProfilingTests.cpp
@@ -34,6 +34,7 @@
 #include <armnn/Types.hpp>
 
 #include <armnn/Utils.hpp>
+#include <armnn/utility/IgnoreUnused.hpp>
 
 #include <boost/algorithm/string.hpp>
 #include <boost/numeric/conversion/cast.hpp>
@@ -1697,7 +1698,7 @@ BOOST_AUTO_TEST_CASE(CounterSelectionCommandHandlerParseData)
     {
         bool IsCounterRegistered(uint16_t counterUid) const override
         {
-            boost::ignore_unused(counterUid);
+            armnn::IgnoreUnused(counterUid);
             return true;
         }
         uint16_t GetCounterCount() const override
@@ -1706,7 +1707,7 @@ BOOST_AUTO_TEST_CASE(CounterSelectionCommandHandlerParseData)
         }
         uint32_t GetCounterValue(uint16_t counterUid) const override
         {
-            boost::ignore_unused(counterUid);
+            armnn::IgnoreUnused(counterUid);
             return 0;
         }
     };
@@ -2092,7 +2093,7 @@ BOOST_AUTO_TEST_CASE(CheckPeriodicCounterCaptureThread)
         //not used
         bool IsCounterRegistered(uint16_t counterUid) const override
         {
-            boost::ignore_unused(counterUid);
+            armnn::IgnoreUnused(counterUid);
             return false;
         }
 
diff --git a/src/profiling/test/ProfilingTests.hpp b/src/profiling/test/ProfilingTests.hpp
index 8b4bc84bd1..008110392c 100644
--- a/src/profiling/test/ProfilingTests.hpp
+++ b/src/profiling/test/ProfilingTests.hpp
@@ -77,7 +77,7 @@ public:
 
     bool WritePacket(const unsigned char* buffer, uint32_t length) override
     {
-        boost::ignore_unused(buffer, length);
+        IgnoreUnused(buffer, length);
 
         return false;
     }
@@ -139,7 +139,7 @@ public:
 
     Packet ReadPacket(uint32_t timeout) override
     {
-        boost::ignore_unused(timeout);
+        IgnoreUnused(timeout);
         ++m_ReadRequests;
         throw armnn::Exception("Simulate a non-timeout error");
     }
@@ -158,7 +158,7 @@ class TestProfilingConnectionBadAckPacket : public TestProfilingConnectionBase
 public:
     Packet ReadPacket(uint32_t timeout) override
     {
-        boost::ignore_unused(timeout);
+        IgnoreUnused(timeout);
         // Connection Acknowledged Packet header (word 0, word 1 is always zero):
         // 26:31 [6]  packet_family: Control Packet Family, value 0b000000
         // 16:25 [10] packet_id: Packet identifier, value 0b0000000001
@@ -181,7 +181,7 @@ public:
 
     void operator()(const Packet& packet) override
     {
-        boost::ignore_unused(packet);
+        IgnoreUnused(packet);
         m_Count++;
     }
 
diff --git a/src/profiling/test/SendCounterPacketTests.hpp b/src/profiling/test/SendCounterPacketTests.hpp
index 8b46ed17d6..7a5f7962e6 100644
--- a/src/profiling/test/SendCounterPacketTests.hpp
+++ b/src/profiling/test/SendCounterPacketTests.hpp
@@ -13,9 +13,9 @@
 #include <armnn/Exceptions.hpp>
 #include <armnn/Optional.hpp>
 #include <armnn/Conversion.hpp>
+#include <armnn/utility/IgnoreUnused.hpp>
 
 #include <boost/assert.hpp>
-#include <boost/core/ignore_unused.hpp>
 #include <boost/numeric/conversion/cast.hpp>
 
 #include <atomic>