From 799846de027188af85b437fe917fe231bbf3d474 Mon Sep 17 00:00:00 2001 From: Pavel Kirienko Date: Sat, 19 Apr 2014 16:32:42 +0400 Subject: [PATCH] Scope hiding fixes --- libuavcan/include/uavcan/driver/can.hpp | 8 ++++---- libuavcan/include/uavcan/map.hpp | 6 +++--- libuavcan/include/uavcan/node/service_client.hpp | 8 ++++---- libuavcan/include/uavcan/node/timer.hpp | 6 +++--- .../uavcan/protocol/global_time_sync_master.hpp | 2 +- libuavcan/include/uavcan/transport/can_io.hpp | 10 +++++----- .../include/uavcan/transport/transfer_listener.hpp | 14 +++++++------- libuavcan/src/node/uc_scheduler.cpp | 2 +- .../src/protocol/uc_global_time_sync_master.cpp | 4 ++-- libuavcan/src/transport/uc_transfer_listener.cpp | 2 +- .../linux/include/uavcan_linux/socketcan.hpp | 10 +++++----- 11 files changed, 36 insertions(+), 36 deletions(-) diff --git a/libuavcan/include/uavcan/driver/can.hpp b/libuavcan/include/uavcan/driver/can.hpp index 5ef4866cae..ce339b8306 100644 --- a/libuavcan/include/uavcan/driver/can.hpp +++ b/libuavcan/include/uavcan/driver/can.hpp @@ -38,13 +38,13 @@ struct UAVCAN_EXPORT CanFrame std::fill(data, data + MaxDataLen, 0); } - CanFrame(uint32_t id, const uint8_t* data, uint8_t data_len) - : id(id) + CanFrame(uint32_t arg_id, const uint8_t* arg_data, uint8_t data_len) + : id(arg_id) , dlc((data_len > MaxDataLen) ? MaxDataLen : data_len) { - assert(data != NULL); + assert(arg_data != NULL); assert(data_len == dlc); - std::copy(data, data + dlc, this->data); + (void)std::copy(arg_data, arg_data + dlc, this->data); } bool operator!=(const CanFrame& rhs) const { return !operator==(rhs); } diff --git a/libuavcan/include/uavcan/map.hpp b/libuavcan/include/uavcan/map.hpp index 3f536b71e4..4ca20b1e9d 100644 --- a/libuavcan/include/uavcan/map.hpp +++ b/libuavcan/include/uavcan/map.hpp @@ -32,9 +32,9 @@ class UAVCAN_EXPORT MapBase : Noncopyable Key key; Value value; KVPair() { } - KVPair(const Key& key, const Value& value) - : key(key) - , value(value) + KVPair(const Key& arg_key, const Value& arg_value) + : key(arg_key) + , value(arg_value) { } bool match(const Key& rhs) const { return rhs == key; } }; diff --git a/libuavcan/include/uavcan/node/service_client.hpp b/libuavcan/include/uavcan/node/service_client.hpp index a68db41cb6..7333e19051 100644 --- a/libuavcan/include/uavcan/node/service_client.hpp +++ b/libuavcan/include/uavcan/node/service_client.hpp @@ -39,10 +39,10 @@ struct UAVCAN_EXPORT ServiceCallResult NodeID server_node_id; ResponseFieldType& response; ///< Either response contents or unspecified response structure - ServiceCallResult(Status status, NodeID server_node_id, ResponseFieldType& response) - : status(status) - , server_node_id(server_node_id) - , response(response) + ServiceCallResult(Status arg_status, NodeID arg_server_node_id, ResponseFieldType& arg_response) + : status(arg_status) + , server_node_id(arg_server_node_id) + , response(arg_response) { assert(server_node_id.isUnicast()); assert(status == Success || status == ErrorTimeout); diff --git a/libuavcan/include/uavcan/node/timer.hpp b/libuavcan/include/uavcan/node/timer.hpp index 5231da3730..ce1fb5dc6d 100644 --- a/libuavcan/include/uavcan/node/timer.hpp +++ b/libuavcan/include/uavcan/node/timer.hpp @@ -30,9 +30,9 @@ struct UAVCAN_EXPORT TimerEvent MonotonicTime scheduled_time; MonotonicTime real_time; - TimerEvent(MonotonicTime scheduled_time, MonotonicTime real_time) - : scheduled_time(scheduled_time) - , real_time(real_time) + TimerEvent(MonotonicTime arg_scheduled_time, MonotonicTime arg_real_time) + : scheduled_time(arg_scheduled_time) + , real_time(arg_real_time) { } }; diff --git a/libuavcan/include/uavcan/protocol/global_time_sync_master.hpp b/libuavcan/include/uavcan/protocol/global_time_sync_master.hpp index 384dd624d9..db1ffcb794 100644 --- a/libuavcan/include/uavcan/protocol/global_time_sync_master.hpp +++ b/libuavcan/include/uavcan/protocol/global_time_sync_master.hpp @@ -21,7 +21,7 @@ class UAVCAN_EXPORT GlobalTimeSyncMaster : protected LoopbackFrameListenerBase class IfaceMaster { Publisher pub_; - MonotonicTime prev_pub_mono_; + MonotonicTime iface_prev_pub_mono_; UtcTime prev_tx_utc_; const uint8_t iface_index_; diff --git a/libuavcan/include/uavcan/transport/can_io.hpp b/libuavcan/include/uavcan/transport/can_io.hpp index 25eda5847b..dfa9fa91b3 100644 --- a/libuavcan/include/uavcan/transport/can_io.hpp +++ b/libuavcan/include/uavcan/transport/can_io.hpp @@ -50,11 +50,11 @@ public: uint8_t qos; CanIOFlags flags; - Entry(const CanFrame& frame, MonotonicTime deadline, Qos qos, CanIOFlags flags) - : deadline(deadline) - , frame(frame) - , qos(uint8_t(qos)) - , flags(flags) + Entry(const CanFrame& arg_frame, MonotonicTime arg_deadline, Qos arg_qos, CanIOFlags arg_flags) + : deadline(arg_deadline) + , frame(arg_frame) + , qos(uint8_t(arg_qos)) + , flags(arg_flags) { assert((qos == Volatile) || (qos == Persistent)); IsDynamicallyAllocatable::check(); diff --git a/libuavcan/include/uavcan/transport/transfer_listener.hpp b/libuavcan/include/uavcan/transport/transfer_listener.hpp index dfea4c0b52..7e674357e9 100644 --- a/libuavcan/include/uavcan/transport/transfer_listener.hpp +++ b/libuavcan/include/uavcan/transport/transfer_listener.hpp @@ -97,12 +97,12 @@ class UAVCAN_EXPORT TransferListenerBase : public LinkedListNodegetDeadline() > ts; diff --git a/libuavcan/src/protocol/uc_global_time_sync_master.cpp b/libuavcan/src/protocol/uc_global_time_sync_master.cpp index 5a29d72daf..5cdb1a5173 100644 --- a/libuavcan/src/protocol/uc_global_time_sync_master.cpp +++ b/libuavcan/src/protocol/uc_global_time_sync_master.cpp @@ -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; diff --git a/libuavcan/src/transport/uc_transfer_listener.cpp b/libuavcan/src/transport/uc_transfer_listener.cpp index 808dcd4102..4c3fb8d4c4 100644 --- a/libuavcan/src/transport/uc_transfer_listener.cpp +++ b/libuavcan/src/transport/uc_transfer_listener.cpp @@ -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; diff --git a/libuavcan_drivers/linux/include/uavcan_linux/socketcan.hpp b/libuavcan_drivers/linux/include/uavcan_linux/socketcan.hpp index 7fcd1ab310..b8784e1114 100644 --- a/libuavcan_drivers/linux/include/uavcan_linux/socketcan.hpp +++ b/libuavcan_drivers/linux/include/uavcan_linux/socketcan.hpp @@ -95,10 +95,10 @@ class SocketCanIface : public uavcan::ICanIface : flags(0) { } - TxItem(const uavcan::CanFrame& frame, uavcan::MonotonicTime deadline, uavcan::CanIOFlags flags) - : frame(frame) - , deadline(deadline) - , flags(flags) + TxItem(const uavcan::CanFrame& arg_frame, uavcan::MonotonicTime arg_deadline, uavcan::CanIOFlags arg_flags) + : frame(arg_frame) + , deadline(arg_deadline) + , flags(arg_flags) { } bool operator<(const TxItem& rhs) const { return frame.priorityLowerThan(rhs.frame); } @@ -190,7 +190,7 @@ class SocketCanIface : public uavcan::ICanIface struct Control { cmsghdr cm; - std::uint8_t control[sizeof(::timeval)]; + std::uint8_t data[sizeof(::timeval)]; }; auto control = Control();