From f8625ef447f8fc12fc1543c35a8fbe6c602543d4 Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Tue, 7 Feb 2023 21:36:06 -0500 Subject: [PATCH] Fix rebase error for pr #234 - C++ Fold Expressions PR #234 had a compilation error once it was rebased which wasn't identified until after it was rebased and merged to main causing build to fail. This PR is to fix that rebase error. --- .../cdt/core/parser/tests/ast2/cxx17/FoldExpressionTests.java | 4 ++-- .../eclipse/cdt/core/dom/ast/cpp/ICPPASTFoldExpression.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx17/FoldExpressionTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx17/FoldExpressionTests.java index 809441ef404..92640328fa8 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx17/FoldExpressionTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx17/FoldExpressionTests.java @@ -105,7 +105,7 @@ public void testFoldExpressionInBinaryExpression() throws Exception { // } public void testFoldExpressionRecognition1() throws Exception { final String code = getAboveComment(); - IASTTranslationUnit tu = parse(code, CPP, false, false); + IASTTranslationUnit tu = parse(code, CPP, ScannerKind.STD, false); ICPPASTTemplateDeclaration tdef = getDeclaration(tu, 0); IASTFunctionDefinition fdef = (IASTFunctionDefinition) tdef.getDeclaration(); IASTProblemStatement p1 = getStatement(fdef, 0); @@ -117,7 +117,7 @@ public void testFoldExpressionRecognition1() throws Exception { // } public void testFoldExpressionRecognition2() throws Exception { final String code = getAboveComment(); - IASTTranslationUnit tu = parse(code, CPP, false, false); + IASTTranslationUnit tu = parse(code, CPP, ScannerKind.STD, false); ICPPASTTemplateDeclaration tdef = getDeclaration(tu, 0); IASTFunctionDefinition fdef = (IASTFunctionDefinition) tdef.getDeclaration(); IASTProblemStatement p1 = getStatement(fdef, 0); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFoldExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFoldExpression.java index a295fdfd42c..fb6497bde80 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFoldExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFoldExpression.java @@ -16,7 +16,7 @@ /** * Fold expression, introduced in C++17. * - * @since 8.0 + * @since 8.1 * @noextend This interface is not intended to be extended by clients. * @noimplement This interface is not intended to be implemented by clients. */