diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2017-06-01 13:46:10 +0200 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2017-06-01 18:40:13 +0200 |
| commit | e9b00c3af0c469726e32755715a69395ad1d3718 (patch) | |
| tree | a4ab62ebf0a69a9657292104cd7ee822af996d42 /CAN-binder/low-can-binding/utils | |
| parent | 4499dbbeadc3fb2a7234d2021097ddca2ba3351e (diff) | |
Simplify processing event
Set afb_event into subscription object then there is no more
std::pair used t access it, better use a method from
low_can_subscription_t class
Change-Id: Ic0772d97c18ca8899821cf3ce175166bbe0be660
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'CAN-binder/low-can-binding/utils')
| -rw-r--r-- | CAN-binder/low-can-binding/utils/signals.cpp | 2 | ||||
| -rw-r--r-- | CAN-binder/low-can-binding/utils/signals.hpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/CAN-binder/low-can-binding/utils/signals.cpp b/CAN-binder/low-can-binding/utils/signals.cpp index 02b8405..703b817 100644 --- a/CAN-binder/low-can-binding/utils/signals.cpp +++ b/CAN-binder/low-can-binding/utils/signals.cpp @@ -39,7 +39,7 @@ namespace utils /// @brief return the subscribed_signals map. /// /// @return Map of subscribed signals. - std::map<int, std::pair<std::shared_ptr<low_can_subscription_t>, struct afb_event> >& signals_manager_t::get_subscribed_signals() + std::map<int, std::shared_ptr<low_can_subscription_t> >& signals_manager_t::get_subscribed_signals() { return subscribed_signals_; } diff --git a/CAN-binder/low-can-binding/utils/signals.hpp b/CAN-binder/low-can-binding/utils/signals.hpp index 54d8893..ffabe81 100644 --- a/CAN-binder/low-can-binding/utils/signals.hpp +++ b/CAN-binder/low-can-binding/utils/signals.hpp @@ -41,7 +41,7 @@ namespace utils { private: std::mutex subscribed_signals_mutex_; - std::map<int, std::pair<std::shared_ptr<low_can_subscription_t>, struct afb_event> > subscribed_signals_; + std::map<int, std::shared_ptr<low_can_subscription_t> > subscribed_signals_; signals_manager_t(); ///< Private constructor to make singleton class. @@ -49,7 +49,7 @@ namespace utils static signals_manager_t& instance(); std::mutex& get_subscribed_signals_mutex(); - std::map<int, std::pair<std::shared_ptr<low_can_subscription_t>, struct afb_event> >& get_subscribed_signals(); + std::map<int, std::shared_ptr<low_can_subscription_t> >& get_subscribed_signals(); struct signals_found find_signals(const openxc_DynamicField &key); void find_diagnostic_messages(const openxc_DynamicField &key, std::vector<std::shared_ptr<diagnostic_message_t> >& found_signals); |