diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2017-09-05 19:03:01 +0200 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2017-09-05 19:03:01 +0200 |
| commit | ed4eb586b263af7ed48c5cdbf12a20eff2a17686 (patch) | |
| tree | 9c796eb1e1d870841f2d282cf56d90b99abe322c | |
| parent | 3bc37571d22cc6cbf9c35fc26c0aff5aea887d82 (diff) | |
Change-Id: Iabf3531817251aef5843f7f6dc8a94c2c39fe410
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
| m--------- | conf.d/app-templates | 0 | ||||
| -rw-r--r-- | low-can-binding/binding/low-can-subscription.cpp | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/conf.d/app-templates b/conf.d/app-templates -Subproject ec101c751a6359483a00c0c3923d502845f4512 +Subproject dee58363ddb98f8e63239035f1a8f1ab151c5e9 diff --git a/low-can-binding/binding/low-can-subscription.cpp b/low-can-binding/binding/low-can-subscription.cpp index d94a77b..c3fbdd3 100644 --- a/low-can-binding/binding/low-can-subscription.cpp +++ b/low-can-binding/binding/low-can-subscription.cpp @@ -108,7 +108,7 @@ const std::shared_ptr<diagnostic_message_t> low_can_subscription_t::get_diagnost /// @brief Return the CAN signal name and empty string if not found /// or no CAN signal subscribed -const std::string low_can_socket_t::get_name() const +const std::string low_can_subscription_t::get_name() const { if (can_signal_ != nullptr) return can_signal_->get_name(); @@ -122,7 +122,7 @@ const std::string low_can_socket_t::get_name() const /// @brief Return name from a diagnostic message from a PID /// /// @param[in] pid - Diagnostic message PID -const std::string low_can_socket_t::get_name(uint32_t pid) const +const std::string low_can_subscription_t::get_name(uint32_t pid) const { if (!diagnostic_message_.empty()) return get_diagnostic_message(pid)->get_name() ; |