diff options
author | Sergey Prigogin | 2016-10-28 21:52:56 +0000 |
---|---|---|
committer | Sergey Prigogin | 2016-10-28 21:52:56 +0000 |
commit | 4fa9706ea86ac6121ad586e3a3fa2dce8e75829d (patch) | |
tree | 256d6a496a8eedfc7bb8493e8e0ca86faa6bffcc /core/org.eclipse.cdt.core/parser/org/eclipse/cdt | |
parent | d69b51acc8971fa3799873961d1ce63b554b7bfb (diff) | |
download | org.eclipse.cdt-4fa9706ea86ac6121ad586e3a3fa2dce8e75829d.tar.gz org.eclipse.cdt-4fa9706ea86ac6121ad586e3a3fa2dce8e75829d.tar.xz org.eclipse.cdt-4fa9706ea86ac6121ad586e3a3fa2dce8e75829d.zip |
Cosmetics.
Change-Id: Ibd8c8ac950c55c02259e9dfacb0649dfca8820dc
Diffstat (limited to 'core/org.eclipse.cdt.core/parser/org/eclipse/cdt')
-rw-r--r-- | core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java index 543d829f800..e8ad1a55edc 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java @@ -528,16 +528,16 @@ public class CPPVisitor extends ASTQueries { return binding; if (binding instanceof ICPPClassType) { - final ICPPInternalBinding ib = (ICPPInternalBinding) binding; + ICPPInternalBinding internalBinding = (ICPPInternalBinding) binding; if (templateParametersMatch((ICPPClassType) binding, templateDecl)) { - ib.addDeclaration(elabType); + internalBinding.addDeclaration(elabType); return binding; } - if (CPPSemantics.declaredBefore(ib, name, false)) { + if (CPPSemantics.declaredBefore(internalBinding, name, false)) { return new ProblemBinding(name, IProblemBinding.SEMANTIC_INVALID_REDECLARATION); } - markRedeclaration(ib); + markRedeclaration(internalBinding); } } @@ -614,7 +614,7 @@ public class CPPVisitor extends ASTQueries { return e.getProblem(); } - // Can't lookup anonymous names + // Can't lookup anonymous names. IBinding binding= null; ICPPASTTemplateDeclaration templateDecl = CPPTemplates.getTemplateDeclaration(name); if (name.getLookupKey().length > 0 && scope != null) { @@ -622,16 +622,16 @@ public class CPPVisitor extends ASTQueries { if (binding instanceof ICPPInternalBinding && binding instanceof ICPPClassType && name.isActive()) { - ICPPInternalBinding ib = (ICPPInternalBinding) binding; - if (ib.getDefinition() == null + ICPPInternalBinding internalBinding = (ICPPInternalBinding) binding; + if (internalBinding.getDefinition() == null && templateParametersMatch((ICPPClassType) binding, templateDecl)) { - ASTInternal.addDefinition(ib, compType); + ASTInternal.addDefinition(internalBinding, compType); return binding; } - if (CPPSemantics.declaredBefore(ib, name, false)) { + if (CPPSemantics.declaredBefore(internalBinding, name, false)) { return new ProblemBinding(name, IProblemBinding.SEMANTIC_INVALID_REDEFINITION); } - markRedeclaration(ib); + markRedeclaration(internalBinding); } } if (templateDecl != null) |