Remove unused and useless members.

These members was imported from OpenXC project which was in C so they need
to know array size. As we use vector we doesn't need them anymore. We can
retrieve count using size() vector method

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

diff --git a/CAN-binder/low-can-binding/binding/configuration-generated.cpp b/CAN-binder/low-can-binding/binding/configuration-generated.cpp
index d4778ba..584fc39 100644 (file)
--- a/CAN-binder/low-can-binding/binding/configuration-generated.cpp
+++ b/CAN-binder/low-can-binding/binding/configuration-generated.cpp
@@ -4,7 +4,7 @@
 configuration_t::configuration_t()
        :can_bus_manager_{utils::config_parser_t{"/etc/dev-mapping.conf"}}
        , can_message_set_{
-               can_message_set_t{0, "example", 0, 1, 5, 0, 20, {
+               can_message_set_t{0, "example", {
                        {std::make_shared<can_message_definition_t>(can_message_definition_t{"can0", 0x620, can_message_format_t::STANDARD, frequency_clock_t(0.00000f), true,
                                {
                                        {std::make_shared<can_signal_t>(

diff --git a/CAN-binder/low-can-binding/can/can-message-set.cpp b/CAN-binder/low-can-binding/can/can-message-set.cpp
index 063ca27..46dc448 100644 (file)
--- a/CAN-binder/low-can-binding/can/can-message-set.cpp
+++ b/CAN-binder/low-can-binding/can/can-message-set.cpp
@@ -21,19 +21,9 @@
 can_message_set_t::can_message_set_t(
                uint8_t index,
                const std::string& name,
-               uint8_t can_bus_count,
-               unsigned short can_message_count,
-               unsigned short can_signal_count,
-               unsigned short can_command_count,
-               unsigned short obd2_signal_count,
                std::vector<std::shared_ptr<can_message_definition_t> > can_messages_definition)
        : index_{index}
        , name_{name}
-       , can_bus_count_{can_bus_count}
-       , can_message_count_{can_message_count}
-       , can_signal_count_{can_signal_count}
-       , can_command_count_{can_command_count}
-       , obd2_signal_count_{obd2_signal_count}
        , can_messages_definition_{can_messages_definition}
 {
        for(auto& cmd : can_messages_definition_)

diff --git a/CAN-binder/low-can-binding/can/can-message-set.hpp b/CAN-binder/low-can-binding/can/can-message-set.hpp
index 3d917c1..9555d00 100644 (file)
--- a/CAN-binder/low-can-binding/can/can-message-set.hpp
+++ b/CAN-binder/low-can-binding/can/can-message-set.hpp
@@ -34,22 +34,12 @@ class can_message_set_t
 private:
        uint8_t index_; /// < A numerical ID for the message set, ideally the index in an array for fast lookup
        const std::string name_; /// < The name of the message set.
-       uint8_t can_bus_count_; /// < The number of CAN buses defined for this message set.
-       uint16_t can_message_count_; /// < The number of CAN messages (across all buses) defined for this message set.
-       uint16_t can_signal_count_; /// < The number of CAN signals (across all messages) defined for this message set.
-       uint16_t can_command_count_; /// < The number of CanCommmands defined for this message set.
-       uint16_t obd2_signal_count_; /// < The number of obd2 signals defined for this message set.
        std::vector<std::shared_ptr<can_message_definition_t> > can_messages_definition_; ///< Vector holding all message definition handled by this message set.
 
 public:
        can_message_set_t(
                        uint8_t index,
                        const std::string& name,
-                       uint8_t can_bus_count,
-                       short unsigned int can_message_count,
-                       short unsigned int can_signal_count,
-                       short unsigned int can_command_count,
-                       short unsigned int obd2_signal_count,
                        std::vector<std::shared_ptr<can_message_definition_t> > can_messages_definition);
 
        std::vector<std::shared_ptr<can_message_definition_t> > get_can_message_definition();