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

Scope hiding fixes

Browse Source
This commit is contained in:
Pavel Kirienko
2014-04-19 16:32:42 +04:00
parent c4c77ea321
commit 799846de02
11 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/src/node/uc_scheduler.cpp
+1 -1
View File
@@ -40,7 +40,7 @@ bool DeadlineHandler::isRunning() const
struct MonotonicDeadlineHandlerInsertionComparator
{
const MonotonicTime ts;
explicit MonotonicDeadlineHandlerInsertionComparator(MonotonicTime ts) : ts(ts) { }
explicit MonotonicDeadlineHandlerInsertionComparator(MonotonicTime arg_ts) : ts(arg_ts) { }
bool operator()(const DeadlineHandler* t) const
{
return t->getDeadline() > ts;
libuavcan/src/protocol/uc_global_time_sync_master.cpp
+2 -2
View File
@@ -50,8 +50,8 @@ int GlobalTimeSyncMaster::IfaceMaster::publish(TransferID tid, MonotonicTime cur
assert(pub_.getTransferSender()->getCanIOFlags() == CanIOFlagLoopback);
assert(pub_.getTransferSender()->getIfaceMask() == (1 << iface_index_));
const MonotonicDuration since_prev_pub = current_time - prev_pub_mono_;
prev_pub_mono_ = current_time;
const MonotonicDuration since_prev_pub = current_time - iface_prev_pub_mono_;
iface_prev_pub_mono_ = current_time;
assert(since_prev_pub.isPositive());
const bool long_period = since_prev_pub.toMSec() >= protocol::GlobalTimeSync::MAX_PUBLICATION_PERIOD_MS;
libuavcan/src/transport/uc_transfer_listener.cpp
+1 -1
View File
@@ -89,7 +89,7 @@ bool TransferListenerBase::TimedOutReceiverPredicate::operator()(const TransferB
* destroy the buffers manually.
* Maybe it is not good that the predicate has side effects, but I ran out of better ideas.
*/
bufmgr_.remove(key);
parent_bufmgr_.remove(key);
return true;
}
return false;