mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Correct scope provided by class-specializations for instantiating its base-classes.

Browse source
This commit is contained in:
Markus Schorn 2008-05-29 07:43:37 +00:00
parent a09663e375
commit 732a995791
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassSpecialization.java
View file

@ -85,7 +85,7 @@ public class CPPClassSpecialization extends CPPSpecialization implements
ICPPBase specBinding = (ICPPBase) ((ICPPInternalBase)binding).clone(); ICPPBase specBinding = (ICPPBase) ((ICPPInternalBase)binding).clone();
IBinding base = binding.getBaseClass(); IBinding base = binding.getBaseClass();
if (base instanceof IType) { if (base instanceof IType) {
IType specBase = CPPTemplates.instantiateType((IType) base, argumentMap, getScope()); IType specBase = CPPTemplates.instantiateType((IType) base, argumentMap, specScope);
specBase = SemanticUtil.getUltimateType(specBase, false); specBase = SemanticUtil.getUltimateType(specBase, false);
if (specBase instanceof IBinding && !(specBase instanceof IProblemBinding)) { if (specBase instanceof IBinding && !(specBase instanceof IProblemBinding)) {
((ICPPInternalBase)specBinding).setBaseClass((IBinding)specBase); ((ICPPInternalBase)specBinding).setBaseClass((IBinding)specBase);
@ -105,7 +105,7 @@ public class CPPClassSpecialization extends CPPSpecialization implements
bindings[i] = new CPPBaseClause(bases[i]); bindings[i] = new CPPBaseClause(bases[i]);
IBinding base = bindings[i].getBaseClass(); IBinding base = bindings[i].getBaseClass();
if (base instanceof IType) { if (base instanceof IType) {
IType specBase = CPPTemplates.instantiateType((IType) base, argumentMap, null); IType specBase = CPPTemplates.instantiateType((IType) base, argumentMap, specScope);
if (specBase instanceof ICPPClassType) { if (specBase instanceof ICPPClassType) {
((CPPBaseClause) bindings[i]).setBaseClass((ICPPClassType) specBase); ((CPPBaseClause) bindings[i]).setBaseClass((ICPPClassType) specBase);
} }

2
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassSpecialization.java
View file

@ -165,7 +165,7 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements
ICPPBase specBase = (ICPPBase) ((ICPPInternalBase)origBase).clone(); ICPPBase specBase = (ICPPBase) ((ICPPInternalBase)origBase).clone();
IBinding origClass = origBase.getBaseClass(); IBinding origClass = origBase.getBaseClass();
if (origClass instanceof IType) { if (origClass instanceof IType) {
IType specClass = CPPTemplates.instantiateType((IType) origClass, getArgumentMap(), getScope()); IType specClass = CPPTemplates.instantiateType((IType) origClass, getArgumentMap(), this);
specClass = SemanticUtil.getUltimateType(specClass, true); specClass = SemanticUtil.getUltimateType(specClass, true);
if (specClass instanceof IBinding) { if (specClass instanceof IBinding) {
((ICPPInternalBase)specBase).setBaseClass((IBinding) specClass); ((ICPPInternalBase)specBase).setBaseClass((IBinding) specClass);