From a97762ae212f5519cf9eaec9712afeaf4f6bd968 Mon Sep 17 00:00:00 2001 From: Pavel Kirienko Date: Tue, 26 May 2015 20:13:13 +0300 Subject: [PATCH] Dead code removal --- .../dynamic_node_id_server/allocation_request_manager.hpp | 6 ------ .../protocol/dynamic_node_id_server/distributed/server.hpp | 5 ----- .../dynamic_node_id_server/allocation_request_manager.cpp | 6 ------ 3 files changed, 17 deletions(-) diff --git a/libuavcan/include/uavcan/protocol/dynamic_node_id_server/allocation_request_manager.hpp b/libuavcan/include/uavcan/protocol/dynamic_node_id_server/allocation_request_manager.hpp index cd0f44832e..2c0aa98670 100644 --- a/libuavcan/include/uavcan/protocol/dynamic_node_id_server/allocation_request_manager.hpp +++ b/libuavcan/include/uavcan/protocol/dynamic_node_id_server/allocation_request_manager.hpp @@ -35,11 +35,6 @@ public: */ virtual void handleAllocationRequest(const UniqueID& unique_id, NodeID preferred_node_id) = 0; - /** - * This method will be invoked when there's an Allocation message detected on the bus. - */ - virtual void handleAllocationActivityDetection(const ReceivedDataStructure& msg) = 0; - virtual ~IAllocationRequestHandler() { } }; @@ -132,7 +127,6 @@ class AllocationRequestManager void handleAllocation(const ReceivedDataStructure& msg) { trace(TraceAllocationActivity, msg.getSrcNodeID().get()); - handler_.handleAllocationActivityDetection(msg); if (!msg.isAnonymousTransfer()) { diff --git a/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/server.hpp b/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/server.hpp index 31b709d441..5fd35bb50a 100644 --- a/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/server.hpp +++ b/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/server.hpp @@ -135,11 +135,6 @@ class UAVCAN_EXPORT Server : IAllocationRequestHandler } } - virtual void handleAllocationActivityDetection(const ReceivedDataStructure&) - { - // TODO: remove this method - } - /* * Methods of INodeDiscoveryHandler */ diff --git a/libuavcan/test/protocol/dynamic_node_id_server/allocation_request_manager.cpp b/libuavcan/test/protocol/dynamic_node_id_server/allocation_request_manager.cpp index 037d73bc3a..dfecf86b6a 100644 --- a/libuavcan/test/protocol/dynamic_node_id_server/allocation_request_manager.cpp +++ b/libuavcan/test/protocol/dynamic_node_id_server/allocation_request_manager.cpp @@ -30,12 +30,6 @@ public: return can_followup; } - virtual void handleAllocationActivityDetection( - const uavcan::ReceivedDataStructure& msg) - { - std::cout << "ALLOCATION ACTIVITY\n" << msg << std::endl; - } - bool matchAndPopLastRequest(const UniqueID& unique_id, uavcan::NodeID preferred_node_id) { if (requests_.empty())