diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPSemantics.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPSemantics.java index f3892f091a4..1a37a1e4e1e 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPSemantics.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPSemantics.java @@ -315,7 +315,7 @@ public class CPPSemantics { // Perform argument dependent lookup if (data.checkAssociatedScopes() && !data.hasTypeOrMemberFunctionOrVariableResult()) { - doKoenigLookup(data); + doArgumentDependentLookup(data); } } catch (DOMException e) { data.problem = (ProblemBinding) e.getProblem(); @@ -625,7 +625,7 @@ public class CPPSemantics { return false; } - public static void doKoenigLookup(LookupData data) throws DOMException { + public static void doArgumentDependentLookup(LookupData data) throws DOMException { data.ignoreUsingDirectives = true; // Set 'qualified' to true for the duration of this function call so the calls to lookup() // don't ascend into enclosing scopes. @@ -3805,7 +3805,7 @@ public class CPPSemantics { return null; lookup(funcData, scope); try { - doKoenigLookup(funcData); + doArgumentDependentLookup(funcData); } catch (DOMException e) { } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalFunctionSet.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalFunctionSet.java index 824e99a4274..b0448106ff6 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalFunctionSet.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalFunctionSet.java @@ -311,7 +311,7 @@ public class EvalFunctionSet extends CPPDependentEvaluation { try { // Perform ADL if appropriate. if (!fQualified && fImpliedObjectType == null && !data.hasTypeOrMemberFunctionOrVariableResult()) { - CPPSemantics.doKoenigLookup(data); + CPPSemantics.doArgumentDependentLookup(data); Object[] foundItems = (Object[]) data.foundItems; if (foundItems != null && (functions == null || foundItems.length > functions.length)) { @@ -327,12 +327,12 @@ public class EvalFunctionSet extends CPPDependentEvaluation { } } - // doKoenigLookup() may introduce duplicates into the result. These must be + // doArgumentDependentLookup() may introduce duplicates into the result. These must be // eliminated to avoid resolveFunction() reporting an ambiguity. (Normally, when - // lookup() and doKoenigLookup() are called on the same LookupData object, the + // lookup() and doArgumentDependentLookup() are called on the same LookupData object, the // two functions coordinate using data stored in that object to eliminate // duplicates, but in this case lookup() was called before with a different - // LookupData object and now we are only calling doKoenigLookup()). + // LookupData object and now we are only calling doArgumentDependentLookup()). functions = ArrayUtil.removeDuplicates(functions); } }