From: Romain Forlot <romain.forlot@iot.bzh>
Date: Tue, 5 Sep 2017 17:03:01 +0000 (+0200)
Subject: FixDAB: Kernel mandatory and missynchronized
X-Git-Tag: dab/4.0.1^0
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=ed4eb586b263af7ed48c5cdbf12a20eff2a17686;p=apps%2Flow-level-can-service.git

FixDAB: Kernel mandatory and missynchronized

Change-Id: Iabf3531817251aef5843f7f6dc8a94c2c39fe410
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
---

diff --git a/conf.d/app-templates b/conf.d/app-templates
index ec101c7..dee5836 160000
--- a/conf.d/app-templates
+++ b/conf.d/app-templates
@@ -1 +1 @@
-Subproject commit ec101c751a6359483a00c0c3923d502845f45126
+Subproject commit dee58363ddb98f8e63239035f1a8f1ab151c5e96
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() ;