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 <romain.forlot@iot.bzh>

diff --git a/low-can-binding/binding/application.hpp b/low-can-binding/binding/application.hpp
index 95f64cf..30e2183 100644 (file)
--- a/low-can-binding/binding/application.hpp
+++ b/low-can-binding/binding/application.hpp
@@ -81,7 +81,7 @@ class application_t
 
                const std::vector<std::string>& get_signals_prefix() const;
 
-               std::vector<std::shared_ptr<message_definition_t> > get_messages_definition();
+               vect_ptr_msg_def_t get_messages_definition();
 
                std::shared_ptr<message_definition_t> 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 6bf80c9..320956d 100644 (file)
--- 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<std::shared_ptr<message_definition_t> >& 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 eab4ed6..a084c05 100644 (file)
--- 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<std::shared_ptr<signal_t>> vect_ptr_signal_t;
-typedef std::vector<std::shared_ptr<diagnostic_message_t>> vect_ptr_diag_msg_t;
 typedef std::vector<std::shared_ptr<message_definition_t>> vect_ptr_msg_def_t;
+typedef std::vector<std::shared_ptr<diagnostic_message_t>> 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<std::shared_ptr<message_definition_t> > 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<std::shared_ptr<message_definition_t> >& 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<message_definition_t> msg_def);