From: Romain Forlot Date: Thu, 7 Nov 2019 16:04:12 +0000 (+0100) Subject: message_set: typedef long type signature X-Git-Tag: 8.99.5~85 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=ec243165292930048b6cd4de8709d405d7012ec5;p=apps%2Fagl-service-can-low-level.git message_set: typedef long type signature Convert two long types using typedef to get shorter one Bug-AGL: SPEC-2988 Change-Id: I9f5612def1bce512516a6e1a45711486368bbc51 Signed-off-by: Romain Forlot --- diff --git a/low-can-binding/binding/application.hpp b/low-can-binding/binding/application.hpp index 95f64cf3..30e21833 100644 --- a/low-can-binding/binding/application.hpp +++ b/low-can-binding/binding/application.hpp @@ -81,7 +81,7 @@ class application_t const std::vector& get_signals_prefix() const; - std::vector > get_messages_definition(); + vect_ptr_msg_def_t get_messages_definition(); std::shared_ptr get_message_definition(uint32_t id); diff --git a/low-can-binding/can/message-set.cpp b/low-can-binding/can/message-set.cpp index 6bf80c97..320956d3 100644 --- a/low-can-binding/can/message-set.cpp +++ b/low-can-binding/can/message-set.cpp @@ -23,7 +23,7 @@ message_set_t::message_set_t( uint8_t index, const std::string& name, - const std::vector >& messages_definition, + const vect_ptr_msg_def_t& messages_definition, const vect_ptr_diag_msg_t& diagnostic_messages) : index_{index} , name_{name} diff --git a/low-can-binding/can/message-set.hpp b/low-can-binding/can/message-set.hpp index eab4ed69..a084c051 100644 --- a/low-can-binding/can/message-set.hpp +++ b/low-can-binding/can/message-set.hpp @@ -28,8 +28,8 @@ class message_definition_t; class diagnostic_message_t; typedef std::vector> vect_ptr_signal_t; -typedef std::vector> vect_ptr_diag_msg_t; typedef std::vector> vect_ptr_msg_def_t; +typedef std::vector> vect_ptr_diag_msg_t; /// @brief A parent wrapper for a particular set of CAN messages and diagnostic messages /// (e.g. a vehicle or program). @@ -38,14 +38,14 @@ class message_set_t private: uint8_t index_; /// < A numerical ID for the message set, ideally the index is in an array for fast lookup const std::string name_; /// < The name of the message set. - std::vector > messages_definition_; ///< Vector holding all message definitions handled by the message set. + vect_ptr_msg_def_t messages_definition_; ///< Vector holding all message definitions handled by the message set. vect_ptr_diag_msg_t diagnostic_messages_; ///< Vector holding all diagnostics messages from JSON signals description file. First vector map to message set public: message_set_t( uint8_t index, const std::string& name, - const std::vector >& messages_definition, + const vect_ptr_msg_def_t& messages_definition, const vect_ptr_diag_msg_t& diagnostic_messages); int add_message_definition(std::shared_ptr msg_def);