From a63dcf89353164e17d5b907ee3c74460eeaafa42 Mon Sep 17 00:00:00 2001 From: Doug Schaefer Date: Thu, 11 May 2006 14:37:00 +0000 Subject: [PATCH] Bug 140973 - Fix CCE by checking instanceof first. --- .../cdt/internal/core/dom/parser/cpp/CPPClassTemplate.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassTemplate.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassTemplate.java index 8ebc66f0055..3556305be54 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassTemplate.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassTemplate.java @@ -443,11 +443,13 @@ public class CPPClassTemplate extends CPPTemplateDefinition implements public IScope getCompositeScope() { if( definition == null ) checkForDefinition(); - if( definition != null ){ + + if( definition != null && definition instanceof ICPPASTCompositeTypeSpecifier ){ ICPPASTCompositeTypeSpecifier compSpec = (ICPPASTCompositeTypeSpecifier) definition.getParent(); return compSpec.getScope(); + } else { + return null; } - return null; } /* (non-Javadoc)