diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateTemplateParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateTemplateParameter.java index ce8e5317009..a9dac734031 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateTemplateParameter.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateTemplateParameter.java @@ -59,7 +59,11 @@ public class CPPTemplateTemplateParameter extends CPPTemplateParameter implement public ICPPScope getUnknownScope() { if( unknownScope == null ) { - unknownScope = new CPPUnknownScope( this, null ); + IASTName n = null; + IASTNode[] nodes = getDeclarations(); + if( nodes != null && nodes.length > 0 ) + n = (IASTName) nodes[0]; + unknownScope = new CPPUnknownScope( this, n ); } return unknownScope; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateTypeParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateTypeParameter.java index 47b0ac7bd61..745aad9eed8 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateTypeParameter.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateTypeParameter.java @@ -40,7 +40,11 @@ public class CPPTemplateTypeParameter extends CPPTemplateParameter implements public ICPPScope getUnknownScope() { if( unknownScope == null ) { - unknownScope = new CPPUnknownScope( this, null ); + IASTName n = null; + IASTNode[] nodes = getDeclarations(); + if( nodes != null && nodes.length > 0 ) + n = (IASTName) nodes[0]; + unknownScope = new CPPUnknownScope( this, n ); } return unknownScope; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownBinding.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownBinding.java index 30077039404..ca9b18d934b 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownBinding.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownBinding.java @@ -95,24 +95,21 @@ public class CPPUnknownBinding implements ICPPInternalUnknown { /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPBinding#getQualifiedName() */ - public String[] getQualifiedName() throws DOMException { - // TODO Auto-generated method stub - return null; + public String[] getQualifiedName() { + return CPPVisitor.getQualifiedName( this ); } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPBinding#getQualifiedNameCharArray() */ - public char[][] getQualifiedNameCharArray() throws DOMException { - // TODO Auto-generated method stub - return null; + public char[][] getQualifiedNameCharArray() { + return CPPVisitor.getQualifiedNameCharArray( this ); } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPBinding#isGloballyQualified() */ - public boolean isGloballyQualified() throws DOMException { - // TODO Auto-generated method stub + public boolean isGloballyQualified() { return false; }