diff --git a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF index a1478ba6bac..324595efe70 100644 --- a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF @@ -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 diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplatedTypeTemplateParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplatedTypeTemplateParameter.java index 10a96be182f..b48244143c0 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplatedTypeTemplateParameter.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplatedTypeTemplateParameter.java @@ -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); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplatedTypeTemplateParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplatedTypeTemplateParameter.java index 1684ba771ae..878116579de 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplatedTypeTemplateParameter.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplatedTypeTemplateParameter.java @@ -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); } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java index d62350975b7..fe8fa28f9a1 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java @@ -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) {