fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-18 05:53:34 +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
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan_drivers/linux/include/uavcan_linux/clock.hpp
+3 -3
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)
{