summaryrefslogtreecommitdiff
path: root/src/libs/cplusplus/LookupContext.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/libs/cplusplus/LookupContext.cpp')
-rw-r--r--src/libs/cplusplus/LookupContext.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/libs/cplusplus/LookupContext.cpp b/src/libs/cplusplus/LookupContext.cpp
index ed61e1f8da..4aada73f93 100644
--- a/src/libs/cplusplus/LookupContext.cpp
+++ b/src/libs/cplusplus/LookupContext.cpp
@@ -30,7 +30,6 @@
#include "LookupContext.h"
#include "ResolveExpression.h"
#include "Overview.h"
-#include "CppBindings.h"
#include "DeprecatedGenTemplateInstance.h"
#include <CoreTypes.h>
@@ -186,10 +185,8 @@ QList<Symbol *> LookupContext::lookup(const Name *name, Scope *scope) const
if (! name)
return candidates;
- const Identifier *id = name->identifier();
-
for (; scope; scope = scope->enclosingScope()) {
- if (id && scope->isBlockScope()) {
+ if ((name->isNameId() || name->isTemplateNameId()) && scope->isBlockScope()) {
bindings()->lookupInScope(name, scope, &candidates, /*templateId = */ 0);
if (! candidates.isEmpty())