summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-03-08 13:57:55 +0100
committerRomain Forlot <romain.forlot@iot.bzh>2017-03-16 17:10:39 +0100
commitfd56d95d7f9794aafdbe8afae1dc212b232ae83b (patch)
treea1265595de40aa583438f15f9123aed3d51af6e9
parent8ceec331a4c7381c42b983dcc0863da5ea40daeb (diff)
Fix: wrong assignement of can_bus_t object.
Fix: const function added by mistake. Change-Id: I69dc19922c9e48fc073f1a3e00dd243188110971 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
-rw-r--r--src/configuration.cpp2
-rw-r--r--src/configuration.hpp2
-rw-r--r--src/low-can-binding.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/configuration.cpp b/src/configuration.cpp
index 673e4f4..b9d78c0 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -57,7 +57,7 @@ configuration_t& configuration_t::get_configuration()
return *this;
}
-can_bus_t& configuration_t::get_can_bus_manager() const
+can_bus_t& configuration_t::get_can_bus_manager()
{
return can_bus_manager_;
}
diff --git a/src/configuration.hpp b/src/configuration.hpp
index 5a76944..823d886 100644
--- a/src/configuration.hpp
+++ b/src/configuration.hpp
@@ -55,7 +55,7 @@ class configuration_t
configuration_t& get_configuration() const;
- can_bus_t& get_can_bus_manager() const;
+ can_bus_t& get_can_bus_manager();
diagnostic_manager_t& get_diagnostic_manager() const;
diff --git a/src/low-can-binding.cpp b/src/low-can-binding.cpp
index c44b064..759437b 100644
--- a/src/low-can-binding.cpp
+++ b/src/low-can-binding.cpp
@@ -222,7 +222,7 @@ extern "C"
{
config = new configuration_t();
- can_bus_t can_bus_manager = config->get_can_bus_manager();
+ can_bus_t& can_bus_manager = config->get_can_bus_manager();
/* Open CAN socket */
if(can_bus_manager.init_can_dev() == 0)