mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 09:46:02 +02:00
Code Issues Wiki Activity

Cosmetics.

Browse source 
Change-Id: Ie7a8e50945174ea932ffbf7da4e80815294edba1
This commit is contained in:
Sergey Prigogin 2016-09-19 15:54:43 -07:00
parent 2067bdec1a
commit ba9b1b77da
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/BaseClassLookup.java
View file

@ -214,7 +214,7 @@ class BaseClassLookup {
// There is no result in the baseClass itself or we do content assist, we have to examine // There is no result in the baseClass itself or we do content assist, we have to examine
// its base classes. // its base classes.
ICPPClassType baseClass= result.getClassType(); ICPPClassType baseClass= result.getClassType();
if (baseClass != null) { if (baseClass != null) {
ICPPBase[] grandBases= ClassTypeHelper.getBases(baseClass, data.getLookupPoint()); ICPPBase[] grandBases= ClassTypeHelper.getBases(baseClass, data.getLookupPoint());
if (grandBases != null && grandBases.length > 0) { if (grandBases != null && grandBases.length > 0) {
HashSet<IBinding> grandBaseBindings= null; HashSet<IBinding> grandBaseBindings= null;

18
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPSemantics.java
View file

@ -205,6 +205,7 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTTranslationUnit;
import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPBasicType; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPBasicType;
import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPBuiltinParameter; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPBuiltinParameter;
import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPCompositeBinding; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPCompositeBinding;
import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPDeferredConstructor;
import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPDeferredFunction; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPDeferredFunction;
import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPFunctionType; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPFunctionType;
import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPImplicitFunction; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPImplicitFunction;
@ -215,7 +216,6 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPReferenceType;
import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPScope; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPScope;
import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPTemplateNonTypeArgument; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPTemplateNonTypeArgument;
import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPTemplateParameterMap; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPTemplateParameterMap;
import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPDeferredConstructor;
import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPUnknownField; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPUnknownField;
import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPUnknownMemberClass; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPUnknownMemberClass;
import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPUnknownMethod; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPUnknownMethod;
@ -3109,16 +3109,16 @@ public class CPPSemantics {
} }
private static boolean isViableUserDefinedLiteralOperator(IBinding binding, int kind) { private static boolean isViableUserDefinedLiteralOperator(IBinding binding, int kind) {
if(binding == null || binding instanceof ProblemBinding) { if (binding == null || binding instanceof ProblemBinding) {
return false; return false;
} }
if(binding instanceof ICPPFunction) { if (binding instanceof ICPPFunction) {
ICPPFunction func = (ICPPFunction) binding; ICPPFunction func = (ICPPFunction) binding;
if(func.getRequiredArgumentCount() == 1) { if (func.getRequiredArgumentCount() == 1) {
IType type = null; IType type = null;
if(kind == IASTLiteralExpression.lk_integer_constant) { if (kind == IASTLiteralExpression.lk_integer_constant) {
type = new CPPBasicType(Kind.eInt, IBasicType.IS_UNSIGNED | IBasicType.IS_LONG_LONG); type = new CPPBasicType(Kind.eInt, IBasicType.IS_UNSIGNED | IBasicType.IS_LONG_LONG);
} else if(kind == IASTLiteralExpression.lk_float_constant) { } else if (kind == IASTLiteralExpression.lk_float_constant) {
type = new CPPBasicType(Kind.eDouble, IBasicType.IS_LONG); type = new CPPBasicType(Kind.eDouble, IBasicType.IS_LONG);
} }
return func.getParameters()[0].getType().isSameType(type); return func.getParameters()[0].getType().isSameType(type);
@ -3231,14 +3231,14 @@ public class CPPSemantics {
IBinding litTpl = resolveFunction(data, tplFunctions, true); IBinding litTpl = resolveFunction(data, tplFunctions, true);
// Do we have valid template and non-template bindings? // Do we have valid template and non-template bindings?
if(ret != null && !(ret instanceof IProblemBinding)) { if (ret != null && !(ret instanceof IProblemBinding)) {
// Do we have valid template and non-template bindings? // Do we have valid template and non-template bindings?
if(litTpl instanceof ICPPFunctionInstance) { if (litTpl instanceof ICPPFunctionInstance) {
// Ambiguity? It has two valid options, and the spec says it shouldn't // Ambiguity? It has two valid options, and the spec says it shouldn't
return new ProblemBinding(data.getLookupName(), exp, IProblemBinding.SEMANTIC_AMBIGUOUS_LOOKUP, tplFunctions); return new ProblemBinding(data.getLookupName(), exp, IProblemBinding.SEMANTIC_AMBIGUOUS_LOOKUP, tplFunctions);
} }
} else { } else {
if(litTpl instanceof ICPPFunctionInstance) { if (litTpl instanceof ICPPFunctionInstance) {
// Only the template binding is valid // Only the template binding is valid
ret = litTpl; ret = litTpl;
} else { } else {