Cansat
/
esp32_Adafruit_GPS
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #138 from anarkiwi/minint 

c++ min() wants args of the same type (enables compilation with -fno-permissive).
This commit is contained in:
Matt Goodrich 2022-05-09 17:40:46 -04:00 committed by GitHub
parent 67a6ef4d9c 48ca1177f4
commit 0374d49417
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/NMEA_parse.cpp
View File

@ -751,13 +751,13 @@ char *Adafruit_GPS::parseStr(char *buff, char *p, int n) {
char *e = strchr(p, ','); char *e = strchr(p, ',');
int len = 0; int len = 0;
if (e) { if (e) {
len = min(e - p, n - 1); len = min(int(e - p), n - 1);
strncpy(buff, p, len); // copy up to the comma strncpy(buff, p, len); // copy up to the comma
buff[len] = 0; buff[len] = 0;
} else { } else {
e = strchr(p, '*'); e = strchr(p, '*');
if (e) { if (e) {
len = min(e - p, n - 1); len = min(int(e - p), n - 1);
strncpy(buff, p, len); // or up to the * strncpy(buff, p, len); // or up to the *
buff[e - p] = 0; buff[e - p] = 0;
} else { } else {