From 70ae4fdbaf8a83cbf710f493df66116c5603e042 Mon Sep 17 00:00:00 2001 From: Andrew Niefer Date: Thu, 19 May 2005 20:26:20 +0000 Subject: [PATCH] fix bug 93573 --- .../core/dom/parser/cpp/CPPTemplateDefinition.java | 9 +++------ .../cdt/internal/core/dom/parser/cpp/CPPVisitor.java | 6 ++++++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateDefinition.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateDefinition.java index c2f2846a214..9916985abc2 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateDefinition.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateDefinition.java @@ -238,24 +238,21 @@ public abstract class CPPTemplateDefinition implements ICPPTemplateDefinition, I * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPBinding#getQualifiedName() */ public String[] getQualifiedName() { - // TODO Auto-generated method stub - return null; + return CPPVisitor.getQualifiedName( this ); } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPBinding#getQualifiedNameCharArray() */ public char[][] getQualifiedNameCharArray() { - // TODO Auto-generated method stub - return null; + return CPPVisitor.getQualifiedNameCharArray( this ); } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPBinding#isGloballyQualified() */ public boolean isGloballyQualified() { - // TODO Auto-generated method stub - return false; + return true; } /* (non-Javadoc) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPVisitor.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPVisitor.java index 2b9c393f265..8749780e9b1 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPVisitor.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPVisitor.java @@ -1867,6 +1867,9 @@ public class CPPVisitor { try { ICPPScope scope = (ICPPScope) binding.getScope(); while( scope != null ){ + if( scope instanceof ICPPTemplateScope ) + scope = (ICPPScope) scope.getParent(); + IASTName n = scope.getScopeName(); if( n == null ) break; @@ -1894,6 +1897,9 @@ public class CPPVisitor { try { ICPPScope scope = (ICPPScope) binding.getScope(); while( scope != null ){ + if( scope instanceof ICPPTemplateScope ) + scope = (ICPPScope) scope.getParent(); + IASTName n = scope.getScopeName(); if( n == null ) break;