Revert "Bug 421823 - When a base class lookup runs into a deferred instance, disambig...

This reverts commit a121f85c83d8044eb100e7673c75dc4d0594d381.

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 6071b15..2d24255 100644 (file)
--- 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
@@ -217,7 +217,6 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPScope;
 import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPTemplateNonTypeArgument;
 import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPTemplateParameterMap;
 import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPUnknownConstructor;
-import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPUnknownField;
 import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPUnknownMemberClass;
 import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPUnknownMethod;
 import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPUsingDeclaration;
@@ -498,10 +497,8 @@ public class CPPSemantics {
                if (binding == null && data.skippedScope != null) {
                        if (namePropertyInParent == IASTNamedTypeSpecifier.NAME) {
                                binding= new CPPUnknownMemberClass(data.skippedScope, name.getSimpleID());
-                       } else if (data.isFunctionCall()) {
-                               binding= new CPPUnknownMethod(data.skippedScope, name.getSimpleID());
                        } else {
-                               binding= new CPPUnknownField(data.skippedScope, name.getSimpleID());
+                               binding= new CPPUnknownMethod(data.skippedScope, name.getSimpleID());
                        }
                }