From: Romain Forlot Date: Wed, 8 Mar 2017 12:57:55 +0000 (+0100) Subject: Fix: wrong assignement of can_bus_t object. X-Git-Tag: 3.99.1~365 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=fd56d95d7f9794aafdbe8afae1dc212b232ae83b;p=apps%2Flow-level-can-service.git Fix: wrong assignement of can_bus_t object. Fix: const function added by mistake. Change-Id: I69dc19922c9e48fc073f1a3e00dd243188110971 Signed-off-by: Romain Forlot --- 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)