mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-25 09:55:29 +02:00
Fixed a couple of exceptions when fast indexing ACE&TAO.
This commit is contained in:
parent
fc8276028d
commit
3f989cc33f
2 changed files with 11 additions and 4 deletions
|
@ -82,7 +82,9 @@ public class CPPClassScope extends CPPScope implements ICPPClassScope {
|
|||
ICPPClassType clsType = (ICPPClassType) binding;
|
||||
if( clsType instanceof ICPPClassTemplate ){
|
||||
try {
|
||||
clsType = (ICPPClassType) CPPTemplates.instantiateWithinClassTemplate( (ICPPClassTemplate) clsType );
|
||||
IBinding within = CPPTemplates.instantiateWithinClassTemplate( (ICPPClassTemplate) clsType );
|
||||
if (within instanceof ICPPClassType)
|
||||
clsType = (ICPPClassType)within;
|
||||
} catch ( DOMException e ) {
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1228,8 +1228,11 @@ public class CPPSemantics {
|
|||
if( data.visited == ObjectSet.EMPTY_SET )
|
||||
data.visited = new ObjectSet(2);
|
||||
IBinding b = bases[i].getBaseClass();
|
||||
if( b instanceof ICPPClassType )
|
||||
data.visited.put( ((ICPPClassType)b).getCompositeScope() );
|
||||
if( b instanceof ICPPClassType ) {
|
||||
IScope bScope = ((ICPPClassType)b).getCompositeScope();
|
||||
if (bScope != null)
|
||||
data.visited.put(bScope);
|
||||
}
|
||||
} else {
|
||||
IBinding b = bases[i].getBaseClass();
|
||||
if( b instanceof ICPPClassType )
|
||||
|
@ -2150,7 +2153,9 @@ public class CPPSemantics {
|
|||
cls = new CPPClassType.CPPClassTypeProblem( scope.getPhysicalNode(), IProblemBinding.SEMANTIC_BAD_SCOPE, fn.getNameCharArray() );
|
||||
}
|
||||
if( cls instanceof ICPPClassTemplate ){
|
||||
cls = (ICPPClassType) CPPTemplates.instantiateWithinClassTemplate( (ICPPClassTemplate) cls );
|
||||
IBinding within = CPPTemplates.instantiateWithinClassTemplate( (ICPPClassTemplate) cls );
|
||||
if (within instanceof ICPPClassType)
|
||||
cls = (ICPPClassType)within;
|
||||
}
|
||||
IType implicitType = cls;
|
||||
if( ftype.isConst() || ftype.isVolatile() ){
|
||||
|
|
Loading…
Add table
Reference in a new issue