colin
/
tripwire-open-source
mirror of https://github.com/Tripwire/tripwire-open-source.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix two warnings that show up with Apple clang++ & -std=c++2a, including one where we called empty() on a string (uselessly) instead of the clear() that was obviously intended

This commit is contained in:
Brian Cox 2019-08-03 18:55:11 -07:00
parent 7fa7d01f7c
commit 69f15df805
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/file_unix.cpp
View File

@ -275,8 +275,7 @@ void cFile::Close() //throw(eFile)
mpData->mpCurrStream = NULL; mpData->mpCurrStream = NULL;
} }
mpData->mFileName.clear();
mpData->mFileName.empty();
} }
bool cFile::IsOpen(void) const bool cFile::IsOpen(void) const

4
src/twparser/yylex.cpp
View File

@ -831,8 +831,8 @@ yy_scan::yylex()
yyst = yy_next[yybase]; yyst = yy_next[yybase];
yy_jammed: ; yy_jammed: ;
state[++i] = (yy_state_t) yyst; state[++i] = (yy_state_t) yyst;
} while (!(yyst == (unsigned int)yy_endst || YY_INTERACTIVE && } while (!(yyst == (unsigned int)yy_endst || (YY_INTERACTIVE &&
yy_base[yyst] > yy_nxtmax && yy_default[yyst] == yy_endst)); (yy_base[yyst] > yy_nxtmax) && (yy_default[yyst] == yy_endst))));
YY_DEBUG("<stopped %d, i = %d>\n", yyst, i); YY_DEBUG("<stopped %d, i = %d>\n", yyst, i);
if (yyst != (unsigned int)yy_endst) if (yyst != (unsigned int)yy_endst)