X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=CAN-binder%2Flow-can-binding%2Fcan%2Fcan-message-definition.hpp;h=a9acd4a7847a176f57ad6dfb8ac32f025fd4188e;hb=8c316219e6b02885f316ca996b98d85322519bc8;hp=87c48acaa3dd2ddbd25db041f6eed465c4862afe;hpb=c05bff0624d853be52c7ff6d65209c776f8b504e;p=apps%2Fagl-service-can-low-level.git

diff --git a/CAN-binder/low-can-binding/can/can-message-definition.hpp b/CAN-binder/low-can-binding/can/can-message-definition.hpp
index 87c48aca..a9acd4a7 100644
--- a/CAN-binder/low-can-binding/can/can-message-definition.hpp
+++ b/CAN-binder/low-can-binding/can/can-message-definition.hpp
@@ -30,6 +30,7 @@
 
 #include "can-signals.hpp"
 #include "can-message.hpp"
+#include "can-message-set.hpp"
 #include "../utils/timer.hpp"
 
 class can_message_set_t;
@@ -37,7 +38,7 @@ class can_message_set_t;
 class can_message_definition_t
 {
 private:
-	std::shared_ptr<can_message_set_t> parent_; /*!< parent_ - Pointer to the CAN message set holding this CAN message definition */
+	can_message_set_t* parent_; /*!< parent_ - Pointer to the CAN message set holding this CAN message definition */
 	std::string bus_; /*!< bus_ - Address of CAN bus device. */
 	uint32_t id_; /*!< id_ - The ID of the message.*/
 	can_message_format_t format_; /*!< format_ - the format of the message's ID.*/
@@ -53,15 +54,15 @@ private:
 
 public:
 	//can_message_definition_t(const can_message_definition_t& b);
-	can_message_definition_t(const std::string bus);
-	can_message_definition_t(const std::string bus, uint32_t id, frequency_clock_t frequency_clock, bool force_send_changed);
-	can_message_definition_t(const std::string bus, uint32_t id, can_message_format_t format, frequency_clock_t frequency_clock, bool force_send_changed);
-	can_message_definition_t(const std::string bus, uint32_t id, can_message_format_t format, frequency_clock_t frequency_clock, bool force_send_changed, std::vector<std::shared_ptr<can_signal_t> > can_signals);
+	can_message_definition_t(const std::string& bus);
+	can_message_definition_t(const std::string& bus, uint32_t id, frequency_clock_t frequency_clock, bool force_send_changed);
+	can_message_definition_t(const std::string& bus, uint32_t id, can_message_format_t format, frequency_clock_t frequency_clock, bool force_send_changed);
+	can_message_definition_t(const std::string& bus, uint32_t id, can_message_format_t format, frequency_clock_t frequency_clock, bool force_send_changed, std::vector<std::shared_ptr<can_signal_t> > can_signals);
 
-	const std::string& get_bus_name() const;
+	const std::string get_bus_name() const;
 	uint32_t get_id() const;
-	std::vector<std::shared_ptr<can_signal_t> > get_can_signals();
+	std::vector<std::shared_ptr<can_signal_t> >& get_can_signals();
 
-	void set_parent(std::shared_ptr<can_message_set_t> parent);
+	void set_parent(can_message_set_t* parent);
 	void set_last_value(const can_message_t& cm);
 };