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

Merge pull request #165 from stefanbeller/stack 

symboldatabase: Remove unneeded check
This commit is contained in:
Daniel Marjamäki 2013-08-21 07:30:12 -07:00
parent ef086ee4a9 e0d71de23a
commit 2995b5c3d7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/symboldatabase.cpp
View File

@ -1298,7 +1298,7 @@ void SymbolDatabase::addClassFunction(Scope **scope, const Token **tok, const To
bool match = false; bool match = false;
if (scope1->className == tok1->str() && (scope1->type != Scope::eFunction)) { if (scope1->className == tok1->str() && (scope1->type != Scope::eFunction)) {
// do the scopes match (same scope) or do their names match (multiple namespaces) // do the scopes match (same scope) or do their names match (multiple namespaces)
if ((*scope == scope1->nestedIn) || (*scope && scope1 && if ((*scope == scope1->nestedIn) || (*scope) &&
(*scope)->className == scope1->nestedIn->className && (*scope)->className == scope1->nestedIn->className &&
!(*scope)->className.empty() && !(*scope)->className.empty() &&
(*scope)->type == scope1->nestedIn->type)) { (*scope)->type == scope1->nestedIn->type)) {