diff options
author | Sergey Prigogin | 2014-08-19 23:25:40 +0000 |
---|---|---|
committer | Sergey Prigogin | 2014-08-27 21:34:14 +0000 |
commit | e1516b4a114bcefdc048fb4d6c955d98d17d9087 (patch) | |
tree | 82aa514c87b03e5d85c5cd53f747f416989ace71 | |
parent | 48178ec7f8d5969713981071fda803f534d3d886 (diff) | |
download | org.eclipse.cdt-e1516b4a114bcefdc048fb4d6c955d98d17d9087.tar.gz org.eclipse.cdt-e1516b4a114bcefdc048fb4d6c955d98d17d9087.tar.xz org.eclipse.cdt-e1516b4a114bcefdc048fb4d6c955d98d17d9087.zip |
Cosmetics.
2 files changed, 7 insertions, 9 deletions
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNamespaceAlias.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNamespaceAlias.java index 34f05022d68..7bcf3de1bda 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNamespaceAlias.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNamespaceAlias.java @@ -26,7 +26,6 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor; import org.eclipse.core.runtime.PlatformObject; public class CPPNamespaceAlias extends PlatformObject implements ICPPNamespaceAlias, ICPPInternalBinding { - private ICPPNamespace namespace; private IASTName alias; @@ -58,24 +57,24 @@ public class CPPNamespaceAlias extends PlatformObject implements ICPPNamespaceAl @Override public String[] getQualifiedName() { - return CPPVisitor.getQualifiedName( this ); + return CPPVisitor.getQualifiedName(this); } @Override public char[][] getQualifiedNameCharArray() { - return CPPVisitor.getQualifiedNameCharArray( this ); + return CPPVisitor.getQualifiedNameCharArray(this); } @Override public IScope getScope() { - return CPPVisitor.getContainingScope( alias ); + return CPPVisitor.getContainingScope(alias); } @Override public boolean isGloballyQualified() throws DOMException { IScope scope = getScope(); - while( scope != null ){ - if( scope instanceof ICPPBlockScope ) + while (scope != null) { + if (scope instanceof ICPPBlockScope) return false; scope = scope.getParent(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPNamespaceAlias.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPNamespaceAlias.java index 91e5ab5ffd2..d4d0628bc99 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPNamespaceAlias.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPNamespaceAlias.java @@ -32,7 +32,7 @@ class PDOMCPPNamespaceAlias extends PDOMCPPBinding implements ICPPNamespaceAlias protected static final int RECORD_SIZE = PDOMCPPBinding.RECORD_SIZE + Database.PTR_SIZE; public PDOMCPPNamespaceAlias(PDOMLinkage linkage, PDOMNode parent, ICPPNamespaceAlias alias) - throws CoreException { + throws CoreException { super(linkage, parent, alias.getNameCharArray()); setTargetBinding(parent.getLinkage(), alias.getBinding()); } @@ -52,8 +52,7 @@ class PDOMCPPNamespaceAlias extends PDOMCPPBinding implements ICPPNamespaceAlias private void setTargetBinding(PDOMLinkage linkage, IBinding target) throws CoreException { PDOMBinding namespace = getLinkage().adaptBinding(target); - getDB().putRecPtr(record + NAMESPACE_BINDING, - namespace != null ? namespace.getRecord() : 0); + getDB().putRecPtr(record + NAMESPACE_BINDING, namespace != null ? namespace.getRecord() : 0); } @Override |