From 312ea7796b2ec086f1e37190b6186b8517f3c62d Mon Sep 17 00:00:00 2001
From: Markus Schorn <markus.schorn@windriver.com>
Date: Tue, 13 Feb 2007 16:09:24 +0000
Subject: [PATCH] Follow up for 169666, fix CompositeScope.getScopeName().

---
 .../cdt/internal/core/index/composite/CompositeScope.java  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeScope.java
index 6ecc3b1fed8..4156c6de9ff 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeScope.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeScope.java
@@ -46,10 +46,9 @@ public abstract class CompositeScope implements IIndexScope {
 
 	// Note: for c++ namespaces we are returning an arbitrary name 
 	final public IName getScopeName() throws DOMException {
-		IScope scope = rbinding.getScope();
-		if(scope==null)
-			return null;
-		return scope.getScopeName();
+		if(rbinding instanceof IScope)
+			return ((IScope) rbinding).getScopeName();
+		return null;
 	}
 
 	protected final void fail() {