fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-05-20 01:29:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Safer virtual methods; this breaks compatibility with GCC 4.6

Browse Source
This commit is contained in:
Pavel Kirienko 2015-06-09 23:05:49 +03:00
parent 9ac2813cea
commit 7b44bf8822
6 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libuavcan_drivers/linux/apps/test_node.cpp
View File

@ -67,7 +67,7 @@ static void runForever(const uavcan_linux::NodePtr& node)
{
explicit NodeStatusMonitor(uavcan::INode& node) : uavcan::NodeStatusMonitor(node) { }
virtual void handleNodeStatusChange(const NodeStatusChangeEvent& event)
void handleNodeStatusChange(const NodeStatusChangeEvent& event) override
{
std::cout << "Remote node NID " << int(event.node_id.get()) << " changed status: "
<< int(event.old_status.status_code) << " --> "

2
libuavcan_drivers/linux/apps/uavcan_dynamic_node_id_server.cpp
View File

@ -144,7 +144,7 @@ private:
bool had_events_ = false;
virtual void onEvent(uavcan::dynamic_node_id_server::TraceCode code, std::int64_t argument)
void onEvent(uavcan::dynamic_node_id_server::TraceCode code, std::int64_t argument) override
{
uavcan_posix::dynamic_node_id_server::FileEventTracer::onEvent(code, argument);

2
libuavcan_drivers/linux/apps/uavcan_status_monitor.cpp
View File

@ -37,7 +37,7 @@ class Monitor : public uavcan::NodeStatusMonitor
uavcan_linux::TimerPtr timer_;
std::unordered_map<int, uavcan::protocol::NodeStatus> status_registry_;
virtual void handleNodeStatusMessage(const uavcan::ReceivedDataStructure<uavcan::protocol::NodeStatus>& msg)
void handleNodeStatusMessage(const uavcan::ReceivedDataStructure<uavcan::protocol::NodeStatus>& msg) override
{
status_registry_[msg.getSrcNodeID().get()] = msg;
}

6
libuavcan_drivers/linux/include/uavcan_linux/clock.hpp
View File

@ -80,7 +80,7 @@ public:
* Returns monotonic timestamp from librt.
* @throws uavcan_linux::Exception.
*/
virtual uavcan::MonotonicTime getMonotonic() const
uavcan::MonotonicTime getMonotonic() const override
{
timespec ts;
if (clock_gettime(CLOCK_MONOTONIC, &ts) != 0)
@ -94,7 +94,7 @@ public:
* Returns wall time from gettimeofday().
* @throws uavcan_linux::Exception.
*/
virtual uavcan::UtcTime getUtc() const
uavcan::UtcTime getUtc() const override
{
timeval tv;
if (gettimeofday(&tv, NULL) != 0)
@ -121,7 +121,7 @@ public:
*
* @throws uavcan_linux::Exception.
*/
virtual void adjustUtc(const uavcan::UtcDuration adjustment)
void adjustUtc(const uavcan::UtcDuration adjustment) override
{
if (adj_mode_ == ClockAdjustmentMode::PerDriverPrivate)
{

2
libuavcan_drivers/linux/include/uavcan_linux/helpers.hpp
View File

@ -21,7 +21,7 @@ namespace uavcan_linux
*/
class DefaultLogSink : public uavcan::ILogSink
{
virtual void log(const uavcan::protocol::debug::LogMessage& message)
void log(const uavcan::protocol::debug::LogMessage& message) override
{
const auto tt = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
const auto tstr = std::ctime(&tt);

22
libuavcan_drivers/linux/include/uavcan_linux/socketcan.hpp
View File

@ -323,8 +323,8 @@ public:
/**
* Assumes that the socket is writeable
*/
virtual std::int16_t send(const uavcan::CanFrame& frame, const uavcan::MonotonicTime tx_deadline,
const uavcan::CanIOFlags flags)
std::int16_t send(const uavcan::CanFrame& frame, const uavcan::MonotonicTime tx_deadline,
const uavcan::CanIOFlags flags) override
{
tx_queue_.emplace(frame, tx_deadline, flags);
pollRead(); // Read poll is necessary because it can release the pending TX flag
@ -336,8 +336,8 @@ public:
* Will read the socket only if RX queue is empty.
* Normally, poll() needs to be executed first.
*/
virtual std::int16_t receive(uavcan::CanFrame& out_frame, uavcan::MonotonicTime& out_ts_monotonic,
uavcan::UtcTime& out_ts_utc, uavcan::CanIOFlags& out_flags)
std::int16_t receive(uavcan::CanFrame& out_frame, uavcan::MonotonicTime& out_ts_monotonic,
uavcan::UtcTime& out_ts_utc, uavcan::CanIOFlags& out_flags) override
{
if (rx_queue_.empty())
{
@ -378,8 +378,8 @@ public:
bool hasPendingTx() const { return !tx_queue_.empty(); }
bool hasReadyRx() const { return !rx_queue_.empty(); }
virtual std::int16_t configureFilters(const uavcan::CanFilterConfig* const filter_configs,
const std::uint16_t num_configs)
std::int16_t configureFilters(const uavcan::CanFilterConfig* const filter_configs,
const std::uint16_t num_configs) override
{
if (filter_configs == nullptr)
{
@ -417,12 +417,12 @@ public:
* SocketCAN emulates the CAN filters in software, so the number of filters is virtually unlimited.
* This method returns a constant value.
*/
virtual std::uint16_t getNumFilters() const { return 255; }
std::uint16_t getNumFilters() const override { return 255; }
/**
* Returns total number of errors of each kind detected since the object was created.
*/
virtual std::uint64_t getErrorCount() const
std::uint64_t getErrorCount() const override
{
std::uint64_t ec = 0;
for (auto& kv : errors_) { ec += kv.second; }
@ -532,7 +532,7 @@ public:
* early returns.
* Also it can return more events than were originally requested by uavcan, which is also acceptable.
*/
virtual std::int16_t select(uavcan::CanSelectMasks& inout_masks, uavcan::MonotonicTime blocking_deadline)
std::int16_t select(uavcan::CanSelectMasks& inout_masks, uavcan::MonotonicTime blocking_deadline) override
{
// Detecting whether we need to block at all
bool need_block = (inout_masks.write == 0); // Write queue is infinite
@ -597,12 +597,12 @@ public:
return num_ifaces_;
}
virtual SocketCanIface* getIface(std::uint8_t iface_index)
SocketCanIface* getIface(std::uint8_t iface_index) override
{
return (iface_index >= num_ifaces_) ? nullptr : static_cast<SocketCanIface*>(ifaces_[iface_index]);
}
virtual std::uint8_t getNumIfaces() const { return num_ifaces_; }
std::uint8_t getNumIfaces() const override { return num_ifaces_; }
/**
* Adds one iface by name. Will fail if there are @ref MaxIfaces ifaces registered already.