mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-23 22:52:11 +02:00
Code Issues Wiki Activity

Bug 316747: Fix mistyped 'getTemplateParameter'.

Browse source
This commit is contained in:
Markus Schorn 2010-06-17 14:12:18 +00:00
parent 222046596e
commit 66d10bd31a
4 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/org.eclipse.cdt.core/META-INF/MANIFEST.MF
View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.core; singleton:=true
Bundle-Version: 5.2.100.qualifier
Bundle-Version: 5.3.0.qualifier
Bundle-Activator: org.eclipse.cdt.core.CCorePlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin

9
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplatedTypeTemplateParameter.java
View file

@ -67,8 +67,9 @@ public interface ICPPASTTemplatedTypeTemplateParameter extends ICPPASTTemplatePa
/**
* Add a nested template parameter.
* @since 5.3
*/
public void addTemplateParamter(ICPPASTTemplateParameter parm);
public void addTemplateParameter(ICPPASTTemplateParameter parm);
/**
* Set whether this template template parameter is a parameter pack.
@ -85,4 +86,10 @@ public interface ICPPASTTemplatedTypeTemplateParameter extends ICPPASTTemplatePa
* Set default value for the template template parameter.
*/
public void setDefaultValue(IASTExpression expression);
/**
* @deprecated Use {@link #addTemplateParameter(ICPPASTTemplateParameter)};
*/
@Deprecated
public void addTemplateParamter(ICPPASTTemplateParameter parm);
}

17
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplatedTypeTemplateParameter.java
View file

@ -47,7 +47,7 @@ public class CPPASTTemplatedTypeTemplateParameter extends ASTNode implements
copy.setDefaultValue(fDefaultValue == null ? null : fDefaultValue.copy());
copy.fIsParameterPack= fIsParameterPack;
for(ICPPASTTemplateParameter param : getTemplateParameters())
copy.addTemplateParamter(param == null ? null : param.copy());
copy.addTemplateParameter(param == null ? null : param.copy());
copy.setOffsetAndLength(this);
return copy;
}
@ -59,13 +59,18 @@ public class CPPASTTemplatedTypeTemplateParameter extends ASTNode implements
return fNestedParameters;
}
public void addTemplateParamter(ICPPASTTemplateParameter parm) {
@Deprecated
public void addTemplateParamter(ICPPASTTemplateParameter param) {
addTemplateParameter(param);
}
public void addTemplateParameter(ICPPASTTemplateParameter param) {
assertNotFrozen();
if (parm != null) {
if (param != null) {
fNestedParameters = (ICPPASTTemplateParameter[]) ArrayUtil.append(ICPPASTTemplateParameter.class,
fNestedParameters, parm);
parm.setParent(this);
parm.setPropertyInParent(PARAMETER);
fNestedParameters, param);
param.setParent(this);
param.setPropertyInParent(PARAMETER);
}
}

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

@ -1736,7 +1736,7 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
for (int i = 0; i < tparList.size(); ++i) {
ICPPASTTemplateParameter p = tparList.get(i);
tpar.addTemplateParamter(p);
tpar.addTemplateParameter(p);
}
returnValue.add(tpar);
} else if (lt1 == IToken.tCOMMA) {