From 859f9ced8360fcfe6daedf6c8f6613005893f814 Mon Sep 17 00:00:00 2001 From: Derek Lamberti Date: Tue, 10 Dec 2019 22:05:21 +0000 Subject: IVGCVSW-4246 Clean build of Visitors with -Wextra Change-Id: Icb1b35ff55fa22103777853e6f49fc282d61750d Signed-off-by: Derek Lamberti --- .../test/ActivationSerializationTests.cpp | 3 +++ src/armnnSerializer/test/SerializerTests.cpp | 30 +++++++++++----------- 2 files changed, 18 insertions(+), 15 deletions(-) (limited to 'src/armnnSerializer/test') diff --git a/src/armnnSerializer/test/ActivationSerializationTests.cpp b/src/armnnSerializer/test/ActivationSerializationTests.cpp index 2a46045f59..34e99f66db 100644 --- a/src/armnnSerializer/test/ActivationSerializationTests.cpp +++ b/src/armnnSerializer/test/ActivationSerializationTests.cpp @@ -8,6 +8,8 @@ #include #include "../Serializer.hpp" #include + +#include #include BOOST_AUTO_TEST_SUITE(SerializerTests) @@ -19,6 +21,7 @@ public: const armnn::ActivationDescriptor& activationDescriptor, const char* name) override { + boost::ignore_unused(layer, activationDescriptor); BOOST_TEST(name == "activation"); } }; diff --git a/src/armnnSerializer/test/SerializerTests.cpp b/src/armnnSerializer/test/SerializerTests.cpp index 4260669124..8dfca3c52e 100644 --- a/src/armnnSerializer/test/SerializerTests.cpp +++ b/src/armnnSerializer/test/SerializerTests.cpp @@ -56,7 +56,7 @@ public: \ struct DefaultLayerVerifierPolicy { - static void Apply(const std::string s = "") + static void Apply(const std::string) { BOOST_TEST_MESSAGE("Unexpected layer found in network"); BOOST_TEST(false); @@ -75,7 +75,7 @@ public: void VisitInputLayer(const armnn::IConnectableLayer*, armnn::LayerBindingId, const char*) override {} - void VisitOutputLayer(const armnn::IConnectableLayer*, armnn::LayerBindingId id, const char*) override {} + void VisitOutputLayer(const armnn::IConnectableLayer*, armnn::LayerBindingId, const char*) override {} protected: void VerifyNameAndConnections(const armnn::IConnectableLayer* layer, const char* name) @@ -521,7 +521,7 @@ BOOST_AUTO_TEST_CASE(SerializeConstant) CompareConstTensor(input, m_LayerInput); } - void VisitAdditionLayer(const armnn::IConnectableLayer* layer, const char* name = nullptr) override {} + void VisitAdditionLayer(const armnn::IConnectableLayer*, const char*) override {} private: armnn::ConstTensor m_LayerInput; @@ -927,7 +927,7 @@ public: BOOST_CHECK(descriptor.m_Operation == armnn::ComparisonOperation::Equal); } - void VisitEqualLayer(const armnn::IConnectableLayer* layer, const char* name) override + void VisitEqualLayer(const armnn::IConnectableLayer*, const char*) override { throw armnn::Exception("EqualLayer should have translated to ComparisonLayer"); } @@ -1146,9 +1146,9 @@ BOOST_AUTO_TEST_CASE(SerializeGather) VerifyNameAndConnections(layer, name); } - void VisitConstantLayer(const armnn::IConnectableLayer* layer, - const armnn::ConstTensor& input, - const char *name) override {} + void VisitConstantLayer(const armnn::IConnectableLayer*, + const armnn::ConstTensor&, + const char*) override {} }; const std::string layerName("gather"); @@ -1201,7 +1201,7 @@ public: BOOST_CHECK(descriptor.m_Operation == armnn::ComparisonOperation::Greater); } - void VisitGreaterLayer(const armnn::IConnectableLayer* layer, const char* name) override + void VisitGreaterLayer(const armnn::IConnectableLayer*, const char*) override { throw armnn::Exception("GreaterLayer should have translated to ComparisonLayer"); } @@ -1543,9 +1543,9 @@ public: const armnn::OriginsDescriptor& descriptor) : LayerVerifierBaseWithDescriptor(layerName, inputInfos, outputInfos, descriptor) {} - void VisitMergerLayer(const armnn::IConnectableLayer* layer, - const armnn::OriginsDescriptor& descriptor, - const char* name) override + void VisitMergerLayer(const armnn::IConnectableLayer*, + const armnn::OriginsDescriptor&, + const char*) override { throw armnn::Exception("MergerLayer should have translated to ConcatLayer"); } @@ -2514,9 +2514,9 @@ BOOST_AUTO_TEST_CASE(SerializeSwitch) VerifyNameAndConnections(layer, name); } - void VisitConstantLayer(const armnn::IConnectableLayer* layer, - const armnn::ConstTensor& input, - const char *name) override {} + void VisitConstantLayer(const armnn::IConnectableLayer*, + const armnn::ConstTensor&, + const char*) override {} }; const std::string layerName("switch"); @@ -2658,7 +2658,7 @@ BOOST_AUTO_TEST_CASE(SerializeDeserializeNonLinearNetwork) CompareConstTensor(input, m_LayerInput); } - void VisitAdditionLayer(const armnn::IConnectableLayer* layer, const char* name = nullptr) override {} + void VisitAdditionLayer(const armnn::IConnectableLayer*, const char*) override {} private: armnn::ConstTensor m_LayerInput; -- cgit v1.2.1