From: Romain Forlot Date: Thu, 16 Feb 2017 17:23:46 +0000 (+0000) Subject: Change to push_back instead of insert. X-Git-Tag: 5.0.2~656 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=184b44bb06cae6f167c36948c436d445732eb864;p=apps%2Fagl-service-can-low-level.git Change to push_back instead of insert. Change-Id: If4c03e71894fecf4a926ae314d2b8ef0c54950ac Signed-off-by: Romain Forlot --- diff --git a/src/can-signals.cpp b/src/can-signals.cpp index b20c540d..1b0207c7 100644 --- a/src/can-signals.cpp +++ b/src/can-signals.cpp @@ -29,8 +29,9 @@ std::map ::iterator subscribed_signals_i; /* Find one or many signals based on its name or id * passed through openxc_DynamicField. */ -void find_can_signals(openxc_DynamicField *key, std:vector *signals) +std:vector find_can_signals(openxc_DynamicField *key) { + std:vector signals; int n_signals, i; n_signals = getSignalCount(); @@ -41,7 +42,7 @@ void find_can_signals(openxc_DynamicField *key, std:vector *signals) for(i=0; i<=n_signals; i++) { if(fnmatch(key->string_value, SIGNALS[i]->genericName) == 0) - signals.insert(&SIGNALS[i]); + signals.push_back(&SIGNALS[i]); } break; case openxc_DynamicField_Type::openxc_DynamicField_Type_NUM: @@ -49,7 +50,7 @@ void find_can_signals(openxc_DynamicField *key, std:vector *signals) { CanMessageDefinition *msg_def = SIGNALS[i]->message; if(msg_def->id == key->numeric_value) - signals.insert(&SIGNALS[i]) + signals.push_back(&SIGNALS[i]) } break; default: