walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge branch 'master' of https://github.com/danmar/cppcheck

This commit is contained in:
Alexander Mai 2015-08-29 11:15:55 +02:00
parent 66e4faa621 70368a2e3a
commit d7d11332cd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/tokenize.cpp
View File

@ -9489,7 +9489,7 @@ void Tokenizer::simplifyMicrosoftMemoryFunctions()
namespace { namespace {
struct triplet { struct triplet {
triplet(const char* t, const char* m, const char* u) : tchar(t), mbcs(m), unicode(u) {} triplet(const char* t, const char* m, const char* u) : tchar(t), mbcs(m), unicode(u) {}
triplet(const std::string& t) : tchar(t) {} explicit triplet(const std::string& t) : tchar(t) {}
bool operator <(const triplet& rhs) const { bool operator <(const triplet& rhs) const {
return tchar < rhs.tchar; return tchar < rhs.tchar;
} }
@ -9540,7 +9540,7 @@ void Tokenizer::simplifyMicrosoftStringFunctions()
const bool ansi = _settings->platformType == Settings::Win32A; const bool ansi = _settings->platformType == Settings::Win32A;
for (Token *tok = list.front(); tok; tok = tok->next()) { for (Token *tok = list.front(); tok; tok = tok->next()) {
std::set<triplet>::const_iterator match = apis.find(tok->str()); std::set<triplet>::const_iterator match = apis.find(triplet(tok->str()));
if (match!=apis.end()) { if (match!=apis.end()) {
const std::string pattern(match->tchar + " ("); const std::string pattern(match->tchar + " (");
if (Token::simpleMatch(tok, pattern.c_str())) { if (Token::simpleMatch(tok, pattern.c_str())) {