X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=CAN-binder%2Flow-can-binding%2Fcan%2Fcan-message-definition.cpp;h=19f06fb15bd9e9ce4bb4d3e2c6d93fc6239ea53d;hb=8c316219e6b02885f316ca996b98d85322519bc8;hp=e947026b52dc628ef8b62fab78073c55b932fd26;hpb=6222973c39ee02ad52a5d0b4b400024157ff2eeb;p=apps%2Fagl-service-can-low-level.git diff --git a/CAN-binder/low-can-binding/can/can-message-definition.cpp b/CAN-binder/low-can-binding/can/can-message-definition.cpp index e947026b..19f06fb1 100644 --- a/CAN-binder/low-can-binding/can/can-message-definition.cpp +++ b/CAN-binder/low-can-binding/can/can-message-definition.cpp @@ -17,12 +17,12 @@ #include "can-message-definition.hpp" -can_message_definition_t::can_message_definition_t(const std::string bus) +can_message_definition_t::can_message_definition_t(const std::string& bus) : parent_{nullptr}, bus_{bus}, last_value_{CAN_MESSAGE_SIZE} {} can_message_definition_t::can_message_definition_t( - const std::string bus, + const std::string& bus, uint32_t id, frequency_clock_t frequency_clock, bool force_send_changed) @@ -35,7 +35,7 @@ can_message_definition_t::can_message_definition_t( {} can_message_definition_t::can_message_definition_t( - const std::string bus, + const std::string& bus, uint32_t id, can_message_format_t format, frequency_clock_t frequency_clock, @@ -50,7 +50,7 @@ can_message_definition_t::can_message_definition_t( {} can_message_definition_t::can_message_definition_t( - const std::string bus, + const std::string& bus, uint32_t id, can_message_format_t format, frequency_clock_t frequency_clock, @@ -67,7 +67,7 @@ can_message_definition_t::can_message_definition_t( { for(auto& sig: can_signals_) { - sig->set_parent(std::make_shared(*this)); + sig->set_parent(this); } } @@ -82,7 +82,7 @@ can_message_definition_t::can_message_definition_t( can_signals_{b.can_signals_} {}*/ -const std::string& can_message_definition_t::get_bus_name() const +const std::string can_message_definition_t::get_bus_name() const { return bus_; } @@ -92,12 +92,12 @@ uint32_t can_message_definition_t::get_id() const return id_; } -std::vector > can_message_definition_t::get_can_signals() +std::vector >& can_message_definition_t::get_can_signals() { return can_signals_; } -void can_message_definition_t::set_parent(std::shared_ptr parent) +void can_message_definition_t::set_parent(can_message_set_t* parent) { parent_= parent; }