X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=CAN-binder%2Flow-can-binding%2Fcan%2Fcan-message-definition.cpp;h=a9ee20c5043ed5ad6c00acfd01ceca5365953417;hb=5412b6a4cd9e08b742035dddace225c9bbf5a203;hp=407ed41d4bca4630b61fcaffbfb20ea36abd015c;hpb=acb0ad5052b81c111333a75f99bdf4bafe299792;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 407ed41d..a9ee20c5 100644 --- a/CAN-binder/low-can-binding/can/can-message-definition.cpp +++ b/CAN-binder/low-can-binding/can/can-message-definition.cpp @@ -55,7 +55,7 @@ can_message_definition_t::can_message_definition_t( can_message_format_t format, frequency_clock_t frequency_clock, bool force_send_changed, - std::vector > can_signals) + const std::vector >& can_signals) : parent_{nullptr}, bus_{bus}, id_{id}, @@ -64,25 +64,9 @@ can_message_definition_t::can_message_definition_t( force_send_changed_{force_send_changed}, last_value_{CAN_MESSAGE_SIZE}, can_signals_{std::move(can_signals)} -{ - for(auto& sig: can_signals_) - { - sig->set_parent(std::make_shared(*this)); - } -} - -/*can_message_definition_t(const can_message_definition_t& b) - : parent_{b.parent_}, - bus_{b.bus_}, - id_{b.id_}, - format_{b.format_}, - frequency_clock_{b.frequency_clock_}, - force_send_changed_{b.force_send_changed_}, - last_value_{b.last_value_}, - 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_; } @@ -97,7 +81,7 @@ std::vector >& can_message_definition_t::get_can_s 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; }