fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-26 18:33:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add override keyword to those methods requiring it

Browse Source
This commit is contained in:
Peter Barker
2021-10-20 21:33:54 -04:00
committed by Daniel Agar
parent 29e1aa6c12
commit ebfa20c994
14 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/include/uavcan/node/generic_subscriber.hpp
+1 -1
View File
@@ -134,7 +134,7 @@ class UAVCAN_EXPORT GenericSubscriber : public GenericSubscriberBase
{
SelfType& obj_;
void handleIncomingTransfer(IncomingTransfer& transfer)
void handleIncomingTransfer(IncomingTransfer& transfer) override
{
obj_.handleIncomingTransfer(transfer);
}
libuavcan/include/uavcan/node/node.hpp
+4 -4
View File
@@ -64,7 +64,7 @@ class UAVCAN_EXPORT Node : public INode
}
protected:
virtual void registerInternalFailure(const char* msg)
virtual void registerInternalFailure(const char* msg) override
{
internal_failure_cnt_++;
UAVCAN_TRACE("Node", "Internal failure: %s", msg);
@@ -112,10 +112,10 @@ public:
commonInit();
}
virtual typename RemoveReference<Allocator>::Type& getAllocator() { return pool_allocator_; }
virtual typename RemoveReference<Allocator>::Type& getAllocator() override { return pool_allocator_; }
virtual Scheduler& getScheduler() { return scheduler_; }
virtual const Scheduler& getScheduler() const { return scheduler_; }
virtual Scheduler& getScheduler() override { return scheduler_; }
virtual const Scheduler& getScheduler() const override { return scheduler_; }
int spin(MonotonicTime deadline)
{
libuavcan/include/uavcan/node/service_client.hpp
+4 -4
View File
@@ -126,7 +126,7 @@ protected:
const ServiceCallID id_;
bool timed_out_;
virtual void handleDeadline(MonotonicTime);
virtual void handleDeadline(MonotonicTime) override;
public:
CallState(INode& node, ServiceClientBase& owner, ServiceCallID call_id)
@@ -262,13 +262,13 @@ private:
PublisherType publisher_;
Callback callback_;
virtual bool shouldAcceptFrame(const RxFrame& frame) const; // Called from the transfer listener
virtual bool shouldAcceptFrame(const RxFrame& frame) const override; // Called from the transfer listener
void invokeCallback(ServiceCallResultType& result);
virtual void handleReceivedDataStruct(ReceivedDataStructure<ResponseType>& response);
virtual void handleReceivedDataStruct(ReceivedDataStructure<ResponseType>& response) override;
virtual void handleDeadline(MonotonicTime);
virtual void handleDeadline(MonotonicTime) override;
int addCallState(ServiceCallID call_id);
libuavcan/include/uavcan/node/service_server.hpp
+1 -1
View File
@@ -104,7 +104,7 @@ private:
Callback callback_;
uint32_t response_failure_count_;
virtual void handleReceivedDataStruct(ReceivedDataStructure<RequestType>& request)
virtual void handleReceivedDataStruct(ReceivedDataStructure<RequestType>& request) override
{
UAVCAN_ASSERT(request.getTransferType() == TransferTypeServiceRequest);
libuavcan/include/uavcan/node/subscriber.hpp
+1 -1
View File
@@ -53,7 +53,7 @@ private:
Callback callback_;
virtual void handleReceivedDataStruct(ReceivedDataStructure<DataType_>& msg)
virtual void handleReceivedDataStruct(ReceivedDataStructure<DataType_>& msg) override
{
if (coerceOrFallback<bool>(callback_, true))
{
libuavcan/include/uavcan/node/timer.hpp
+1 -1
View File
@@ -47,7 +47,7 @@ class UAVCAN_EXPORT TimerBase : private DeadlineHandler
{
MonotonicDuration period_;
virtual void handleDeadline(MonotonicTime current);
virtual void handleDeadline(MonotonicTime current) override;
public:
using DeadlineHandler::stop;