From eaea3167f82db349a1caee6e345d49f2d1ad7b36 Mon Sep 17 00:00:00 2001 From: Markus Schorn Date: Mon, 28 Jan 2008 15:17:35 +0000 Subject: [PATCH] Changes to namespace-aliases as local bindings, bug 215783. --- .../internal/core/pdom/dom/cpp/PDOMCPPLinkage.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java index 1e45543f2b1..8545ac2698c 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java @@ -787,16 +787,20 @@ class PDOMCPPLinkage extends PDOMLinkage implements IIndexCPPBindingConstants { if (binding instanceof ICPPMethod) { return null; } - if (binding instanceof ICPPUsingDeclaration || binding instanceof ICPPNamespaceAlias) { - if (pdom instanceof WritablePDOM) { - final WritablePDOM wpdom= (WritablePDOM) pdom; + if (pdom instanceof WritablePDOM) { + final WritablePDOM wpdom= (WritablePDOM) pdom; + if (binding instanceof ICPPUsingDeclaration) { String path= ASTInternal.getDeclaredInOneFileOnly(binding); if (path != null) { return wpdom.getFileForASTPath(getLinkageID(), path); } + } else if (binding instanceof ICPPNamespaceAlias) { + String path= ASTInternal.getDeclaredInSourceFileOnly(binding); + if (path != null) { + return wpdom.getFileForASTPath(getLinkageID(), path); + } } - return null; - } + } return super.getLocalToFile(binding); } }