Change vector to list to allow to remove signal.

[apps/agl-service-can-low-level.git] / low-can-binding / utils / signals.hpp

diff --git a/low-can-binding/utils/signals.hpp b/low-can-binding/utils/signals.hpp
index 10cb8ad..b28942e 100644 (file)
--- a/low-can-binding/utils/signals.hpp
+++ b/low-can-binding/utils/signals.hpp
@@ -17,13 +17,14 @@
 
 #pragma once
 
+#include <list>
 #include <vector>
 #include <string>
 #include <fnmatch.h>
 
 #include "openxc.pb.h"
 #include "../binding/application.hpp"
-#include "../can/can-signals.hpp"
+#include "../can/signals.hpp"
 #include "../diagnostic/diagnostic-message.hpp"
 
 #include "../binding/low-can-subscription.hpp"
@@ -32,8 +33,8 @@ namespace utils
 {
        struct signals_found
        {
-               std::vector<std::shared_ptr<can_signal_t> > can_signals;
-               std::vector<std::shared_ptr<diagnostic_message_t> > diagnostic_messages;
+               std::list<std::shared_ptr<signal_t> > signals;
+               std::list<std::shared_ptr<diagnostic_message_t> > diagnostic_messages;
        };
 
        /// @brief Signal manager singleton hold subscription object with attached afb_event_t and its mutex
@@ -56,10 +57,10 @@ namespace utils
 
                struct signals_found find_signals(const openxc_DynamicField &key);
                void find_diagnostic_messages(const openxc_DynamicField &key, std::vector<std::shared_ptr<diagnostic_message_t> >& found_signals);
-               void find_can_signals(const openxc_DynamicField &key, std::vector<std::shared_ptr<can_signal_t> >& found_signals);
+               void find_signals(const openxc_DynamicField &key, std::vector<std::shared_ptr<signal_t> >& found_signals);
 
                template <typename T>
-               void lookup_signals_by_name(const std::string& key, std::vector<std::shared_ptr<T> > signals, std::vector<std::shared_ptr<T> >& found_signals)
+               void lookup_signals_by_name(const std::string& key, std::vector<std::shared_ptr<T> > signals, std::list<std::shared_ptr<T> >& found_signals)
                {
                        for(std::shared_ptr<T> s : signals)
                        {
@@ -71,7 +72,7 @@ namespace utils
                }
 
                template <typename T>
-               void lookup_signals_by_id(const double key, std::vector<std::shared_ptr<T> > signals, std::vector<std::shared_ptr<T> >& found_signals)
+               void lookup_signals_by_id(const double key, std::vector<std::shared_ptr<T> > signals, std::list<std::shared_ptr<T> >& found_signals)
                {
                        for(std::shared_ptr<T> s : signals)
                        {