can_message: add missing signature due to conflict 03/23203/6
authorRomain Forlot <romain.forlot@iot.bzh>
Sun, 10 Nov 2019 18:17:18 +0000 (19:17 +0100)
committerRomain Forlot <romain.forlot@iot.bzh>
Thu, 9 Jan 2020 13:40:41 +0000 (14:40 +0100)
Bug-AGL: SPEC-2988

Change-Id: Ib705ae7c500bb9d3abc863053943298c87896bd2
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
low-can-binding/can/message/can-message.hpp

index 9d501a2..d3d8453 100644 (file)
@@ -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();
 };