Adjust method signature to be more efficient.

Return vector reference and doesn't return const ref.

Change-Id: Ibcbc1d72e4baf1a7b8bf017d36d6d37d25312d6d
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
# Conflicts:
#	CAN-binder/low-can-binding/can/can-signals.hpp

diff --git a/CAN-binder/low-can-binding/binding/configuration.cpp b/CAN-binder/low-can-binding/binding/configuration.cpp
index 4898bdc..623ba78 100644 (file)
--- a/CAN-binder/low-can-binding/binding/configuration.cpp
+++ b/CAN-binder/low-can-binding/binding/configuration.cpp
@@ -42,7 +42,7 @@ uint8_t configuration_t::get_active_message_set() const
        return active_message_set_;
 }
 
-const std::vector<std::shared_ptr<can_message_set_t> >& configuration_t::get_can_message_set()
+std::vector<std::shared_ptr<can_message_set_t> > configuration_t::get_can_message_set()
 {
        return can_message_set_;
 }
@@ -52,12 +52,12 @@ std::vector<std::shared_ptr<can_signal_t> > configuration_t::get_all_can_signals
        return can_message_set_[active_message_set_]->get_all_can_signals();
 }
 
-std::vector<std::shared_ptr<diagnostic_message_t> > configuration_t::get_diagnostic_messages()
+std::vector<std::shared_ptr<diagnostic_message_t> >& configuration_t::get_diagnostic_messages()
 {
        return can_message_set_[active_message_set_]->get_diagnostic_messages();
 }
 
-std::vector<std::shared_ptr<can_message_definition_t> > configuration_t::get_can_message_definition()
+std::vector<std::shared_ptr<can_message_definition_t> >& configuration_t::get_can_message_definition()
 {
        return can_message_set_[active_message_set_]->get_can_message_definition();
 }

diff --git a/CAN-binder/low-can-binding/binding/configuration.hpp b/CAN-binder/low-can-binding/binding/configuration.hpp
index fd66923..3ab88ee 100644 (file)
--- a/CAN-binder/low-can-binding/binding/configuration.hpp
+++ b/CAN-binder/low-can-binding/binding/configuration.hpp
@@ -65,15 +65,15 @@ class configuration_t
 
                uint8_t get_active_message_set() const;
 
-               const std::vector<std::shared_ptr<can_message_set_t> >& get_can_message_set();
+               std::vector<std::shared_ptr<can_message_set_t> > get_can_message_set();
 
                std::vector<std::shared_ptr<can_signal_t> > get_all_can_signals();
 
-               std::vector<std::shared_ptr<diagnostic_message_t> > get_diagnostic_messages();
+               std::vector<std::shared_ptr<diagnostic_message_t> >& get_diagnostic_messages();
 
                const std::vector<std::string>& get_signals_prefix() const;
 
-               std::vector<std::shared_ptr<can_message_definition_t> > get_can_message_definition();
+               std::vector<std::shared_ptr<can_message_definition_t> >& get_can_message_definition();
 
                uint32_t get_signal_id(diagnostic_message_t& sig) const;
 

diff --git a/CAN-binder/low-can-binding/can/can-message-definition.cpp b/CAN-binder/low-can-binding/can/can-message-definition.cpp
index 19f06fb..256af88 100644 (file)
--- a/CAN-binder/low-can-binding/can/can-message-definition.cpp
+++ b/CAN-binder/low-can-binding/can/can-message-definition.cpp
@@ -17,12 +17,12 @@
 
 #include "can-message-definition.hpp"
 
-can_message_definition_t::can_message_definition_t(const std::string& bus)
+can_message_definition_t::can_message_definition_t(const std::string bus)
        : parent_{nullptr}, bus_{bus}, last_value_{CAN_MESSAGE_SIZE}
 {}
 
 can_message_definition_t::can_message_definition_t(
-       const std::string& bus,
+       const std::string bus,
        uint32_t id,
        frequency_clock_t frequency_clock,
        bool force_send_changed)
@@ -35,7 +35,7 @@ can_message_definition_t::can_message_definition_t(
 {}
 
 can_message_definition_t::can_message_definition_t(
-       const std::string& bus,
+       const std::string bus,
        uint32_t id,
        can_message_format_t format,
        frequency_clock_t frequency_clock,
@@ -50,12 +50,12 @@ can_message_definition_t::can_message_definition_t(
 {}
 
 can_message_definition_t::can_message_definition_t(
-       const std::string& bus,
+       const std::string bus,
        uint32_t id,
        can_message_format_t format,
        frequency_clock_t frequency_clock,
        bool force_send_changed,
-       std::vector<std::shared_ptr<can_signal_t> > can_signals)
+       const std::vector<std::shared_ptr<can_signal_t> >& can_signals)
        :  parent_{nullptr},
        bus_{bus},
        id_{id},
@@ -71,17 +71,6 @@ can_message_definition_t::can_message_definition_t(
        }
 }
 
-/*can_message_definition_t(const can_message_definition_t& b)
-       :  parent_{b.parent_},
-       bus_{b.bus_},
-       id_{b.id_},
-       format_{b.format_},
-       frequency_clock_{b.frequency_clock_},
-       force_send_changed_{b.force_send_changed_},
-       last_value_{b.last_value_},
-       can_signals_{b.can_signals_}
-       {}*/
-
 const std::string can_message_definition_t::get_bus_name() const
 {
        return bus_;

diff --git a/CAN-binder/low-can-binding/can/can-message-definition.hpp b/CAN-binder/low-can-binding/can/can-message-definition.hpp
index a9acd4a..233d8ce 100644 (file)
--- a/CAN-binder/low-can-binding/can/can-message-definition.hpp
+++ b/CAN-binder/low-can-binding/can/can-message-definition.hpp
@@ -54,10 +54,10 @@ private:
 
 public:
        //can_message_definition_t(const can_message_definition_t& b);
-       can_message_definition_t(const std::string& bus);
-       can_message_definition_t(const std::string& bus, uint32_t id, frequency_clock_t frequency_clock, bool force_send_changed);
-       can_message_definition_t(const std::string& bus, uint32_t id, can_message_format_t format, frequency_clock_t frequency_clock, bool force_send_changed);
-       can_message_definition_t(const std::string& bus, uint32_t id, can_message_format_t format, frequency_clock_t frequency_clock, bool force_send_changed, std::vector<std::shared_ptr<can_signal_t> > can_signals);
+       can_message_definition_t(const std::string bus);
+       can_message_definition_t(const std::string bus, uint32_t id, frequency_clock_t frequency_clock, bool force_send_changed);
+       can_message_definition_t(const std::string bus, uint32_t id, can_message_format_t format, frequency_clock_t frequency_clock, bool force_send_changed);
+       can_message_definition_t(const std::string bus, uint32_t id, can_message_format_t format, frequency_clock_t frequency_clock, bool force_send_changed, const std::vector<std::shared_ptr<can_signal_t> >& can_signals);
 
        const std::string get_bus_name() const;
        uint32_t get_id() const;

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 0bce918..1e352d9 100644 (file)
--- a/CAN-binder/low-can-binding/can/can-message-set.cpp
+++ b/CAN-binder/low-can-binding/can/can-message-set.cpp
@@ -22,9 +22,9 @@
 
 can_message_set_t::can_message_set_t(
                uint8_t index,
-               const std::string& name,
-               std::vector<std::shared_ptr<can_message_definition_t> > can_messages_definition,
-               std::vector<std::shared_ptr<diagnostic_message_t> > diagnostic_messages)
+               const std::string name,
+               const std::vector<std::shared_ptr<can_message_definition_t> >& can_messages_definition,
+               const std::vector<std::shared_ptr<diagnostic_message_t> >& diagnostic_messages)
        : index_{index}
        , name_{name}
        , can_messages_definition_{std::move(can_messages_definition)}
@@ -42,17 +42,17 @@ can_message_set_t::can_message_set_t(
 }
 
 /// @brief Return vector holding all message definition handled by this message set.
-std::vector<std::shared_ptr<can_message_definition_t> > can_message_set_t::get_can_message_definition()
+std::vector<std::shared_ptr<can_message_definition_t> >& can_message_set_t::get_can_message_definition()
 {
        return can_messages_definition_;
 }
 
-std::vector<std::shared_ptr<can_signal_t> > can_message_set_t::get_can_signals() const
+std::vector<std::shared_ptr<can_signal_t> > can_message_set_t::get_all_can_signals() const
 {
        std::vector<std::shared_ptr<can_signal_t> > can_signals;
        for(const auto& cmd: can_messages_definition_)
        {
-               std::vector<std::shared_ptr<can_signal_t> > cmd_signals = cmd->get_can_signals();
+               std::vector<std::shared_ptr<can_signal_t> >& cmd_signals = cmd->get_can_signals();
                can_signals.insert( can_signals.end(),
                                                        cmd_signals.begin(),
                                                        cmd_signals.end()
@@ -62,7 +62,7 @@ std::vector<std::shared_ptr<can_signal_t> > can_message_set_t::get_can_signals()
        return can_signals;
 }
 
-std::vector<std::shared_ptr<diagnostic_message_t> > can_message_set_t::get_diagnostic_messages()
+std::vector<std::shared_ptr<diagnostic_message_t> >& can_message_set_t::get_diagnostic_messages()
 {
        return diagnostic_messages_;
 }
\ No newline at end of file

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 1cc5042..ca01abc 100644 (file)
--- a/CAN-binder/low-can-binding/can/can-message-set.hpp
+++ b/CAN-binder/low-can-binding/can/can-message-set.hpp
@@ -40,11 +40,11 @@ private:
 public:
        can_message_set_t(
                        uint8_t index,
-                       const std::string& name,
-                       std::vector<std::shared_ptr<can_message_definition_t> > can_messages_definition,
-                       std::vector<std::shared_ptr<diagnostic_message_t> > diagnostic_messages);
+                       const std::string name,
+                       const std::vector<std::shared_ptr<can_message_definition_t> >& can_messages_definition,
+                       const std::vector<std::shared_ptr<diagnostic_message_t> >& diagnostic_messages);
 
-       std::vector<std::shared_ptr<can_message_definition_t> > get_can_message_definition();
-       std::vector<std::shared_ptr<can_signal_t> > get_can_signals() const;
-       std::vector<std::shared_ptr<diagnostic_message_t> > get_diagnostic_messages();
+       std::vector<std::shared_ptr<can_message_definition_t> >& get_can_message_definition();
+       std::vector<std::shared_ptr<can_signal_t> > get_all_can_signals() const;
+       std::vector<std::shared_ptr<diagnostic_message_t> >& get_diagnostic_messages();
 };

diff --git a/CAN-binder/low-can-binding/can/can-signals.cpp b/CAN-binder/low-can-binding/can/can-signals.cpp
index bc33e06..024855c 100644 (file)
--- a/CAN-binder/low-can-binding/can/can-signals.cpp
+++ b/CAN-binder/low-can-binding/can/can-signals.cpp
@@ -94,7 +94,7 @@ can_message_definition_t* can_signal_t::get_message() const
        return parent_;
 }
 
-const std::string& can_signal_t::get_generic_name() const
+const std::string can_signal_t::get_generic_name() const
 {
        return generic_name_;
 }
@@ -104,7 +104,7 @@ const std::string can_signal_t::get_name() const
        return prefix_ + "." + generic_name_;
 }
 
-const std::string& can_signal_t::get_prefix() const
+const std::string can_signal_t::get_prefix() const
 {
        return prefix_;
 }

diff --git a/CAN-binder/low-can-binding/can/can-signals.hpp b/CAN-binder/low-can-binding/can/can-signals.hpp
index f30d6b3..e4077c2 100644 (file)
--- a/CAN-binder/low-can-binding/can/can-signals.hpp
+++ b/CAN-binder/low-can-binding/can/can-signals.hpp
@@ -129,9 +129,9 @@ public:
 
        utils::socketcan_bcm_t get_socket() const;
        can_message_definition_t* get_message() const;
-       const std::string& get_generic_name() const;
+       const std::string get_generic_name() const;
        const std::string get_name() const;
-       const std::string& get_prefix() const;
+       const std::string get_prefix() const;
        uint8_t get_bit_position() const;
        uint8_t get_bit_size() const;
        float get_factor() const;

diff --git a/CAN-binder/low-can-binding/diagnostic/diagnostic-message.cpp b/CAN-binder/low-can-binding/diagnostic/diagnostic-message.cpp
index 9459de6..4455aa8 100644 (file)
--- a/CAN-binder/low-can-binding/diagnostic/diagnostic-message.cpp
+++ b/CAN-binder/low-can-binding/diagnostic/diagnostic-message.cpp
@@ -46,7 +46,7 @@ uint32_t diagnostic_message_t::get_pid()
        return (uint32_t)pid_;
 }
 
-const std::string& diagnostic_message_t::get_generic_name() const
+const std::string diagnostic_message_t::get_generic_name() const
 {
        return generic_name_;
 }

diff --git a/CAN-binder/low-can-binding/diagnostic/diagnostic-message.hpp b/CAN-binder/low-can-binding/diagnostic/diagnostic-message.hpp
index 675e189..ac427b9 100644 (file)
--- a/CAN-binder/low-can-binding/diagnostic/diagnostic-message.hpp
+++ b/CAN-binder/low-can-binding/diagnostic/diagnostic-message.hpp
@@ -68,7 +68,7 @@ class diagnostic_message_t
                                                                                        DiagnosticResponseDecoder decoder, DiagnosticResponseCallback callback, bool supported);
 
                uint32_t get_pid();
-               const std::string& get_generic_name() const;
+               const std::string get_generic_name() const;
                const std::string get_name() const;
                float get_frequency() const;
                DiagnosticResponseDecoder get_decoder() const;