mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-29 11:55:40 +02:00
Code Issues Wiki Activity

Cosmetics.

Browse source
This commit is contained in:
Sergey Prigogin 2010-04-11 06:30:30 +00:00
parent 2648a64836
commit b36b8e6f80
2 changed files with 8 additions and 8 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/CPPConstructorInstance.java
View file

@ -27,6 +27,6 @@ public class CPPConstructorInstance extends CPPMethodInstance implements ICPPCon
} }
public boolean isExplicit() throws DOMException { public boolean isExplicit() throws DOMException {
return ((ICPPConstructor)getTemplateDefinition()).isExplicit(); return ((ICPPConstructor) getTemplateDefinition()).isExplicit();
} }
} }

14
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/TemplateArgumentDeduction.java
View file

@ -175,7 +175,7 @@ public class TemplateArgumentDeduction {
return false; return false;
par= fnParPack= ((ICPPParameterPackType) par).getType(); par= fnParPack= ((ICPPParameterPackType) par).getType();
deduct= new TemplateArgumentDeduction(deduct, fnArgs.length-j); deduct= new TemplateArgumentDeduction(deduct, fnArgs.length - j);
} }
} else { } else {
break; break;
@ -422,11 +422,11 @@ public class TemplateArgumentDeduction {
fPackOffset= packSize > 0 ? 0 : -1; fPackOffset= packSize > 0 ? 0 : -1;
} }
private void incPackOffset() { private void incPackOffset() {
fPackOffset++; fPackOffset++;
assert fPackOffset < fPackSize; assert fPackOffset < fPackSize;
} }
/** /**
* Deduces the template parameter mapping from one pair of template arguments. * Deduces the template parameter mapping from one pair of template arguments.
*/ */
@ -573,16 +573,16 @@ public class TemplateArgumentDeduction {
// Check for being a non-deduced context. // Check for being a non-deduced context.
final ICPPTemplateArgument[] pArgs = pInst.getTemplateArguments(); final ICPPTemplateArgument[] pArgs = pInst.getTemplateArguments();
for (int i = 0; i < pArgs.length-1; i++) { for (int i = 0; i < pArgs.length - 1; i++) {
if (pArgs[i].isPackExpansion()) if (pArgs[i].isPackExpansion())
return true; // non-deduced context return true; // non-deduced context
} }
final ICPPTemplateArgument[] aArgs = aInst.getTemplateArguments(); final ICPPTemplateArgument[] aArgs = aInst.getTemplateArguments();
if (pArgs.length != aArgs.length) { if (pArgs.length != aArgs.length) {
if (pArgs.length == 0 || pArgs.length > aArgs.length+1) if (pArgs.length == 0 || pArgs.length > aArgs.length + 1)
return false; return false;
ICPPTemplateArgument lastPParam= pArgs[pArgs.length-1]; ICPPTemplateArgument lastPParam= pArgs[pArgs.length - 1];
if (!lastPParam.isPackExpansion()) if (!lastPParam.isPackExpansion())
return false; return false;
} }
@ -620,9 +620,9 @@ public class TemplateArgumentDeduction {
IType[] pParams = ftp.getParameterTypes(); IType[] pParams = ftp.getParameterTypes();
IType[] aParams = fta.getParameterTypes(); IType[] aParams = fta.getParameterTypes();
if (pParams.length != aParams.length) { if (pParams.length != aParams.length) {
if (pParams.length == 0 || pParams.length > aParams.length+1) if (pParams.length == 0 || pParams.length > aParams.length + 1)
return false; return false;
IType lastPParam= pParams[pParams.length-1]; IType lastPParam= pParams[pParams.length - 1];
if (!(lastPParam instanceof ICPPParameterPackType)) if (!(lastPParam instanceof ICPPParameterPackType))
return false; return false;
} }