From: Romain Forlot <romain.forlot@iot.bzh>
Date: Sun, 10 Nov 2019 18:17:18 +0000 (+0100)
Subject: can_message: add missing signature due to conflict
X-Git-Tag: 8.99.5~80
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=9a3b70076654b41bec0c6c916c940187623de2ad;p=apps%2Fagl-service-can-low-level.git

can_message: add missing signature due to conflict

Bug-AGL: SPEC-2988

Change-Id: Ib705ae7c500bb9d3abc863053943298c87896bd2
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
---

diff --git a/low-can-binding/can/message/can-message.hpp b/low-can-binding/can/message/can-message.hpp
index 9d501a25..d3d8453c 100644
--- a/low-can-binding/can/message/can-message.hpp
+++ b/low-can-binding/can/message/can-message.hpp
@@ -49,16 +49,15 @@ class can_message_t : public message_t {
 
 		uint32_t get_id() const;
 		void set_id(const canid_t id);
+		bool is_correct_to_send();
 
 		static std::shared_ptr<can_message_t> convert_from_frame(const canfd_frame& frame, size_t nbytes, uint64_t timestamp);
 		struct canfd_frame convert_to_canfd_frame();
 		struct std::vector<canfd_frame> convert_to_canfd_frame_vector();
-		struct can_frame convert_to_can_frame();
-
-		bool is_correct_to_send();
-		bool is_set();
 		struct bcm_msg& get_bcm_msg();
 		void set_bcm_msg(struct bcm_msg bcm_msg);
 
+		struct can_frame convert_to_can_frame();
+		bool is_set();
 		std::string get_debug_message();
 };