alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-03-15 04:57:30 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

nmea_gps: Fix iterator

Browse Source 
Small fixes for new nmea_gps code.  Fixed an iterator which could get
dereferenced incorrectly, and changed an auto to an explicit type.

Signed-off-by: Noel Eck <noel.eck@intel.com>
This commit is contained in:
Noel Eck 2018-05-23 20:52:57 -07:00
parent 3a077df5f6
commit 8b4e1020f4
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/nmea_gps/nmea_gps.cxx
View File

@ -234,7 +234,7 @@ void NMEAGPS::_parse_gpgsv(const std::string& sentence)
/* Add to the back of satmap, remove any matching prn */ /* Add to the back of satmap, remove any matching prn */
_mtx_satlist.lock(); _mtx_satlist.lock();
auto sit = _satlist.begin(); auto sit = _satlist.begin();
do while(sit != _satlist.end())
{ {
/* Remove */ /* Remove */
if ((*sit).prn == sat.prn) if ((*sit).prn == sat.prn)
@ -242,7 +242,8 @@ void NMEAGPS::_parse_gpgsv(const std::string& sentence)
sit = _satlist.erase(sit); sit = _satlist.erase(sit);
break; break;
} }
} while(++sit != _satlist.end()); ++sit;
}
/* Add satellite to the end */ /* Add satellite to the end */
_satlist.push_back(sat); _satlist.push_back(sat);
@ -458,7 +459,7 @@ std::string satellite::__str__()
std::string NMEAGPS::__str__() std::string NMEAGPS::__str__()
{ {
std::ostringstream oss; std::ostringstream oss;
auto sats = satellites(); std::vector<satellite> sats = satellites();
size_t qsz = getMaxQueueDepth(); size_t qsz = getMaxQueueDepth();
oss << "NMEA GPS Instance" << std::endl oss << "NMEA GPS Instance" << std::endl
<< " Parsing: " << (isRunning() ? "T" : "F") << std::endl << " Parsing: " << (isRunning() ? "T" : "F") << std::endl