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

Cosmetics

Browse source 
Change-Id: Id86b562ee7b2b2b2944dd25e0178d4ecb452f5a8
This commit is contained in:
Sergey Prigogin 2016-12-17 12:32:55 -08:00
parent aca869c045
commit 03bcd35cdf
3 changed files with 1290 additions and 1290 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -955,10 +955,11 @@ public class CPPSemantics {
} else if (!scoped || idx >= resultInitialSize) { } else if (!scoped || idx >= resultInitialSize) {
Object obj = resultMap.get(key); Object obj = resultMap.get(key);
if (obj instanceof Object[]) { if (obj instanceof Object[]) {
if (so instanceof IBinding || so instanceof IASTName) if (so instanceof IBinding || so instanceof IASTName) {
obj = ArrayUtil.append(Object.class, (Object[]) obj, so); obj = ArrayUtil.append(Object.class, (Object[]) obj, so);
else } else {
obj = ArrayUtil.addAll(Object.class, (Object[]) obj, (Object[]) so); obj = ArrayUtil.addAll(Object.class, (Object[]) obj, (Object[]) so);
}
} else { } else {
if (so instanceof IBinding || so instanceof IASTName) { if (so instanceof IBinding || so instanceof IASTName) {
obj = new Object[] { obj, so }; obj = new Object[] { obj, so };
@ -3507,7 +3508,8 @@ public class CPPSemantics {
if (calculateInheritanceDepth(sourceType, type, typeId) >= 0) { if (calculateInheritanceDepth(sourceType, type, typeId) >= 0) {
c = Conversions.copyInitializationOfClass(isLValue, sourceType, type, false, typeId); c = Conversions.copyInitializationOfClass(isLValue, sourceType, type, false, typeId);
} else { } else {
c = Conversions.checkImplicitConversionSequence(type, sourceType, isLValue, UDCMode.ALLOWED, Context.ORDINARY, typeId); c = Conversions.checkImplicitConversionSequence(type, sourceType, isLValue,
UDCMode.ALLOWED, Context.ORDINARY, typeId);
} }
if (c.converts()) { if (c.converts()) {
ICPPFunction f = c.getUserDefinedConversion(); ICPPFunction f = c.getUserDefinedConversion();
@ -3603,8 +3605,6 @@ public class CPPSemantics {
return idExpression; return idExpression;
} }
/** /**
* For simplicity returns an operator of form RT (T, T) rather than RT (boolean, T, T) * For simplicity returns an operator of form RT (T, T) rather than RT (boolean, T, T)
*/ */