From 8742531520d50d74efa610fa95cc19a872361a41 Mon Sep 17 00:00:00 2001 From: Hoda Amer Date: Wed, 28 Jan 2004 19:23:43 +0000 Subject: [PATCH] Patch For Andrew : Fix for bug#50729 : Visibility is incorrectly decided in inheritance --- core/org.eclipse.cdt.core/parser/ChangeLog-parser | 3 +++ .../eclipse/cdt/internal/core/parser/pst/ContainerSymbol.java | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/ChangeLog-parser b/core/org.eclipse.cdt.core/parser/ChangeLog-parser index ccdce58ca92..b7a1ee690ce 100644 --- a/core/org.eclipse.cdt.core/parser/ChangeLog-parser +++ b/core/org.eclipse.cdt.core/parser/ChangeLog-parser @@ -1,3 +1,6 @@ +2004-01-28 Andrew Niefer + Fixed bug#50729: Visibility is incorrectly decided in inheritance + 2004-01-27 John Camelon Refactored parser to allow for cleaner content assist implementation. Removed IASTCompletionNode.CompletionKind.STATEMENT_START as it is redundant. diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/pst/ContainerSymbol.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/pst/ContainerSymbol.java index 6eead61a551..ca60717cfe1 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/pst/ContainerSymbol.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/pst/ContainerSymbol.java @@ -650,7 +650,7 @@ public class ContainerSymbol extends BasicSymbol implements IContainerSymbol { } IContainerSymbol container = getContainingSymbol(); - IContainerSymbol symbolContainer = ( qualifyingSymbol != null ) ? qualifyingSymbol : symbol.getContainingSymbol(); + IContainerSymbol symbolContainer = symbol.getContainingSymbol(); if( !symbolContainer.isType( TypeInfo.t_class, TypeInfo.t_union ) || symbolContainer.equals( container ) ) @@ -659,7 +659,7 @@ public class ContainerSymbol extends BasicSymbol implements IContainerSymbol { } //if this is a friend of the symbolContainer, then we are good - if( isFriendOf( symbolContainer ) ){ + if( isFriendOf( ( qualifyingSymbol != null ) ? qualifyingSymbol : symbolContainer ) ){ return true; }