From 0db2675912e68ed4ef18ec84a269e4e4aa63f1f2 Mon Sep 17 00:00:00 2001 From: PKEuS Date: Thu, 29 Nov 2012 10:47:52 -0800 Subject: [PATCH] Removed unnecessary pattern "const|" - typeStartToken() never points to "const" --- lib/checkstl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/checkstl.cpp b/lib/checkstl.cpp index ffca82622..7abf505f9 100644 --- a/lib/checkstl.cpp +++ b/lib/checkstl.cpp @@ -1196,7 +1196,7 @@ void CheckStl::string_c_str() tok2 = tok2->previous(); if (tok2 && Token::simpleMatch(tok2->tokAt(-4), ". c_str ( )")) { const Variable* var = symbolDatabase->getVariableFromVarId(tok2->tokAt(-5)->varId()); - if (var && Token::Match(var->typeStartToken(), "const| std ::")) + if (var && Token::simpleMatch(var->typeStartToken(), "std ::")) string_c_strParam(tok, i->second); } } @@ -1242,7 +1242,7 @@ void CheckStl::string_c_str() tok2 = tok2->tokAt(-5); if (tok2->isName()) { // return var.c_str(); => check if var is a std type const Variable* var = symbolDatabase->getVariableFromVarId(tok2->varId()); - if (var && Token::Match(var->typeStartToken(), "const| std ::")) + if (var && Token::simpleMatch(var->typeStartToken(), "std ::")) string_c_strReturn(tok); } else { // TODO: determine if a error should be written or not