From 50c1eba392d6dc0efbfd18f66e19b6a9ed1daa61 Mon Sep 17 00:00:00 2001 From: Alessandro Simovic Date: Fri, 5 Jan 2018 17:54:53 +0100 Subject: [PATCH] snapdragon: fixed compiler shadow warning, function name was identical as a variable name --- src/lib/FlightTasks/SubscriptionArray.hpp | 2 +- src/modules/uORB/Subscription.hpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/FlightTasks/SubscriptionArray.hpp b/src/lib/FlightTasks/SubscriptionArray.hpp index 86d36ffcb8..ba8dd615e0 100644 --- a/src/lib/FlightTasks/SubscriptionArray.hpp +++ b/src/lib/FlightTasks/SubscriptionArray.hpp @@ -85,7 +85,7 @@ bool SubscriptionArray::get(const struct orb_metadata *meta, uORB::Subscription< { // does it already exist? for (int i = 0; i < _subscriptions_count; ++i) { - if (_subscriptions[i]->meta() == meta && _subscriptions[i]->instance() == instance) { + if (_subscriptions[i]->get_meta() == meta && _subscriptions[i]->get_instance() == instance) { // we know the type must be correct, so we can use reinterpret_cast (dynamic_cast is not available) subscription = reinterpret_cast*>(_subscriptions[i]); return true; diff --git a/src/modules/uORB/Subscription.hpp b/src/modules/uORB/Subscription.hpp index 779c60a347..ba574b90fa 100644 --- a/src/modules/uORB/Subscription.hpp +++ b/src/modules/uORB/Subscription.hpp @@ -84,9 +84,9 @@ public: int getHandle() const { return _handle; } - const orb_metadata *meta() const { return _meta; } + const orb_metadata *get_meta() const { return _meta; } - unsigned instance() const { return _instance; } + unsigned get_instance() const { return _instance; } protected: const struct orb_metadata *_meta;