X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Fdiagnostic%2Fdiagnostic-message.hpp;h=eb527aa5dc555af482d4cd80ec2486c9e9166318;hb=fae627b646e9ab709adbd0c60d7582176375e0c3;hp=c2f31e35f6d24ad997288207b53b358b7daf537a;hpb=29de76e9beac2a8e7ffcd1ccba07a927df1f2bcc;p=apps%2Fagl-service-can-low-level.git

diff --git a/low-can-binding/diagnostic/diagnostic-message.hpp b/low-can-binding/diagnostic/diagnostic-message.hpp
index c2f31e35..eb527aa5 100644
--- a/low-can-binding/diagnostic/diagnostic-message.hpp
+++ b/low-can-binding/diagnostic/diagnostic-message.hpp
@@ -21,8 +21,8 @@
 #include <string>
 
 #include "uds/uds.h"
-#include "../can/can-message-set.hpp"
-#include "../can/can-message.hpp"
+#include "../can/message-set.hpp"
+#include "../can/message/can-message.hpp"
 #include "active-diagnostic-request.hpp"
 
 enum UNIT {
@@ -39,13 +39,13 @@ enum UNIT {
 	INVALID
 };
 
-class can_message_set_t;
+class message_set_t;
 
 /// @brief - A representation of an OBD-II PID Mode 01 (Note : An OBD-II PID mode 01 contains only one information).
 class diagnostic_message_t
 {
 	private:
-		can_message_set_t* parent_; /*!< parent_ - Pointer to the CAN message set holding this diagnostic message */
+		std::shared_ptr<message_set_t> parent_; /*!< parent_ - Pointer to the CAN message set holding this diagnostic message */
 		uint8_t pid_; /*!< pid_ - The 1 byte PID.*/
 		std::string generic_name_; /*!< generic_name_ - A human readable name to use for this PID when published.*/
 		int min_; /*!< min_ - Minimum value that can take this pid */
@@ -70,15 +70,15 @@ class diagnostic_message_t
 	public:
 		const char* generic_name = generic_name_.c_str();
 		diagnostic_message_t(uint8_t pid,
-				     const std::string& generic_name,
-				     const int min,
-				     const int max,
-				     enum UNIT unit,
-				     float frequency,
-				     DiagnosticResponseDecoder decoder,
-				     DiagnosticResponseCallback callback,
-				     bool supported,
-				     bool received);
+					 const std::string& generic_name,
+					 const int min,
+					 const int max,
+					 enum UNIT unit,
+					 float frequency,
+					 DiagnosticResponseDecoder decoder,
+					 DiagnosticResponseCallback callback,
+					 bool supported,
+					 bool received);
 
 		uint32_t get_pid();
 		const std::string get_generic_name() const;
@@ -97,7 +97,7 @@ class diagnostic_message_t
 		void set_timestamp(uint64_t timestamp);
 
 		void set_supported(bool value);
-		void set_parent(can_message_set_t* parent);
+		void set_parent(std::shared_ptr<message_set_t> parent);
 		const DiagnosticRequest build_diagnostic_request() const;
 
 		bool is_obd2_response(const can_message_t& can_message);