diff --git a/build/org.eclipse.cdt.make.core/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.make.core/META-INF/MANIFEST.MF index 733c6fbe209..825d3542768 100644 --- a/build/org.eclipse.cdt.make.core/META-INF/MANIFEST.MF +++ b/build/org.eclipse.cdt.make.core/META-INF/MANIFEST.MF @@ -19,10 +19,10 @@ Export-Package: org.eclipse.cdt.make.core, org.eclipse.cdt.make.internal.core.scannerconfig.jobs;x-internal:=true, org.eclipse.cdt.make.internal.core.scannerconfig.util;x-internal:=true, org.eclipse.cdt.make.internal.core.scannerconfig2;x-internal:=true -Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)", +Require-Bundle: org.eclipse.cdt.core;bundle-version="[5.0.0,7.0.0)", + org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)", org.eclipse.core.variables;bundle-version="[3.1.100,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", - org.eclipse.cdt.core;bundle-version="[5.0.0,6.0.0)", org.eclipse.core.filesystem;bundle-version="1.2.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF index 8b62ac883f9..795799e7b5e 100644 --- a/build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF +++ b/build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF @@ -28,7 +28,7 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)", org.eclipse.ui.editors;bundle-version="[3.2.0,4.0.0)", org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)", org.eclipse.ui;bundle-version="[3.2.0,4.0.0)", - org.eclipse.cdt.core;bundle-version="[5.0.0,6.0.0)", + org.eclipse.cdt.core;bundle-version="[5.0.0,7.0.0)", org.eclipse.cdt.ui;bundle-version="[6.0.0,7.0.0)", org.eclipse.cdt.make.core;bundle-version="[7.0.0,8.1.0)", org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", diff --git a/build/org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF index bcf013e24ae..8e51c561686 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF +++ b/build/org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF @@ -32,7 +32,7 @@ Export-Package: org.eclipse.cdt.build.core.scannerconfig, org.eclipse.cdt.managedbuilder.templateengine, org.eclipse.cdt.managedbuilder.templateengine.processes, org.eclipse.cdt.newmake.core -Require-Bundle: org.eclipse.cdt.core;bundle-version="[5.0.0,6.0.0)", +Require-Bundle: org.eclipse.cdt.core;bundle-version="[5.0.0,7.0.0)", org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", org.eclipse.ui;bundle-version="[3.2.0,4.0.0)", diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.managedbuilder.gnu.ui/META-INF/MANIFEST.MF index e750bdba617..f148a81004c 100644 --- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/META-INF/MANIFEST.MF +++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Export-Package: org.eclipse.cdt.managedbuilder.gnu.cygwin, org.eclipse.cdt.managedbuilder.gnu.ui Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", org.eclipse.cdt.managedbuilder.core;bundle-version="[8.1.0,9.0.0)", - org.eclipse.cdt.core;bundle-version="[5.0.0,6.0.0)", + org.eclipse.cdt.core;bundle-version="[5.0.0,7.0.0)", org.eclipse.core.resources Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/build/org.eclipse.cdt.managedbuilder.ui/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.managedbuilder.ui/META-INF/MANIFEST.MF index 203fb1c4c9e..48b8ebe352a 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/META-INF/MANIFEST.MF +++ b/build/org.eclipse.cdt.managedbuilder.ui/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Export-Package: org.eclipse.cdt.managedbuilder.internal.ui.commands;x-internal:= Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", org.eclipse.core.variables;bundle-version="[3.1.100,4.0.0)", - org.eclipse.cdt.core;bundle-version="[5.0.0,6.0.0)", + org.eclipse.cdt.core;bundle-version="[5.0.0,7.0.0)", org.eclipse.cdt.make.core, org.eclipse.cdt.make.ui, org.eclipse.cdt.managedbuilder.core;bundle-version="[8.1.0,9.0.0)", diff --git a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF index 47379a83631..9222ad2ab4b 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.12.0.qualifier +Bundle-Version: 6.0.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/ASTVisitor.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTVisitor.java index 8c99f534a9a..5f8ffe0372c 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTVisitor.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTVisitor.java @@ -485,7 +485,7 @@ public abstract class ASTVisitor { } /** - * @since 5.12 + * @since 6.0 */ public int leave(ICPPASTDesignator designator) { return PROCESS_CONTINUE; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTAttributeList.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTAttributeList.java index 0a8a6512b01..7dbe9952590 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTAttributeList.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTAttributeList.java @@ -12,7 +12,7 @@ package org.eclipse.cdt.core.dom.ast; * @noextend This interface is not intended to be extended by clients. * @noimplement This interface is not intended to be implemented by clients. - * @since 5.12 + * @since 6.0 */ public interface IASTAttributeList extends IASTAttributeSpecifier { /** diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTBinaryTypeIdExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTBinaryTypeIdExpression.java index c5766912ae1..5ecbc1cb503 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTBinaryTypeIdExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTBinaryTypeIdExpression.java @@ -24,7 +24,7 @@ public interface IASTBinaryTypeIdExpression extends IASTExpression { */ public static enum Operator { __is_base_of, - /** @since 5.12 */ + /** @since 6.0 */ __is_trivially_assignable } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTLabelStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTLabelStatement.java index 1df6b4ea227..016c3b12b90 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTLabelStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTLabelStatement.java @@ -17,7 +17,7 @@ package org.eclipse.cdt.core.dom.ast; * @noimplement This interface is not intended to be implemented by clients. */ public interface IASTLabelStatement extends IASTStatement, IASTNameOwner { - /** @since 5.12 */ + /** @since 6.0 */ public static final IASTLabelStatement[] EMPTY_ARRAY = {}; /** * @since 5.4 diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTTypeIdExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTTypeIdExpression.java index caf95187efb..cfc7a15e574 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTTypeIdExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTTypeIdExpression.java @@ -160,7 +160,7 @@ public interface IASTTypeIdExpression extends IASTExpression { /** * Built-in type trait of g++. - * @since 5.12 + * @since 6.0 */ public static final int op_is_trivially_copyable = 24; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTDeclSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTDeclSpecifier.java index 5efa22e81c2..5fd0dc1c3ef 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTDeclSpecifier.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTDeclSpecifier.java @@ -23,7 +23,7 @@ import org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier; */ public interface ICASTDeclSpecifier extends IASTDeclSpecifier { /** - * @since 5.12 + * @since 6.0 */ public static final ASTNodeProperty ALIGNMENT_SPECIFIER = new ASTNodeProperty( "ICASTDeclSpecifier.ALIGNMENT_SPECIFIER - Alignment specifier"); //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTAlignmentSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTAlignmentSpecifier.java index 6cb62cde790..eb397b7f0f7 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTAlignmentSpecifier.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTAlignmentSpecifier.java @@ -15,7 +15,7 @@ import org.eclipse.cdt.core.dom.parser.cpp.ICPPASTAttributeSpecifier; * * In the C++ grammar, an alignment-specifier is an attribute-specifier. * - * @since 5.12 + * @since 6.0 */ public interface ICPPASTAlignmentSpecifier extends IASTAlignmentSpecifier, ICPPASTAttributeSpecifier { @Override diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTArrayDesignator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTArrayDesignator.java index 24f49c88819..1a431878b3d 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTArrayDesignator.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTArrayDesignator.java @@ -14,7 +14,7 @@ import org.eclipse.cdt.core.dom.ast.ASTNodeProperty; /** * Array designator, e.g. [4] in int a[6] = { [4] = 29, [2] = 15 }; - * @since 5.12 + * @since 6.0 * * @noextend This interface is not intended to be extended by clients. * @noimplement This interface is not intended to be implemented by clients. diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTAttributeList.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTAttributeList.java index f2b33bb8a1c..3ed4618356e 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTAttributeList.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTAttributeList.java @@ -16,7 +16,7 @@ import org.eclipse.cdt.core.dom.parser.cpp.ICPPASTAttributeSpecifier; * * @noextend This interface is not intended to be extended by clients. * @noimplement This interface is not intended to be implemented by clients. - * @since 5.12 + * @since 6.0 */ public interface ICPPASTAttributeList extends ICPPASTAttributeSpecifier, IASTAttributeList { } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTDesignatedInitializer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTDesignatedInitializer.java index a972bae1620..518e408e231 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTDesignatedInitializer.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTDesignatedInitializer.java @@ -16,7 +16,7 @@ import org.eclipse.cdt.core.dom.ast.IASTInitializer; /** * This interface represents a designated initializer, * e.g. in struct A y = { .z = 4, .t[1] = 3 }; - * @since 5.12 + * @since 6.0 * * @noextend This interface is not intended to be extended by clients. * @noimplement This interface is not intended to be implemented by clients. diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTDesignator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTDesignator.java index e458f113b56..dce39934aa1 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTDesignator.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTDesignator.java @@ -14,7 +14,7 @@ import org.eclipse.cdt.core.dom.ast.IASTNode; /** * Base interface for all C-style designators. - * @since 5.12 + * @since 6.0 * * @noextend This interface is not intended to be extended by clients. * @noimplement This interface is not intended to be implemented by clients. diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTNaryTypeIdExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTNaryTypeIdExpression.java index 9feca44b2de..3b73a099bd1 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTNaryTypeIdExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTNaryTypeIdExpression.java @@ -18,7 +18,7 @@ import org.eclipse.cdt.core.dom.ast.ASTNodeProperty; * * @noextend This interface is not intended to be extended by clients. * @noimplement This interface is not intended to be implemented by clients. - * @since 5.12 + * @since 6.0 */ public interface ICPPASTNaryTypeIdExpression extends ICPPASTExpression { public static final ASTNodeProperty OPERAND = new ASTNodeProperty("ICPPASTNaryTypeIdExpression.OPERAND [IASTTypeId]"); //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPClassTemplatePartialSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPClassTemplatePartialSpecialization.java index 834099add7d..bf101887f84 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPClassTemplatePartialSpecialization.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPClassTemplatePartialSpecialization.java @@ -23,7 +23,7 @@ package org.eclipse.cdt.core.dom.ast.cpp; * @noimplement This interface is not intended to be implemented by clients. */ public interface ICPPClassTemplatePartialSpecialization extends ICPPClassTemplate, ICPPPartialSpecialization { - /** @since 5.12 */ + /** @since 6.0 */ public static final ICPPClassTemplatePartialSpecialization[] EMPTY_ARRAY = {}; /** @deprecated Use {@link #EMPTY_ARRAY} */ @Deprecated diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPFieldTemplate.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPFieldTemplate.java index 4964895e50f..9ce202c3b95 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPFieldTemplate.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPFieldTemplate.java @@ -14,7 +14,7 @@ package org.eclipse.cdt.core.dom.ast.cpp; /** * A field template. * - * @since 5.12 + * @since 6.0 * @noextend This interface is not intended to be extended by clients. * @noimplement This interface is not intended to be implemented by clients. */ diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPPartialSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPPartialSpecialization.java index 6b4e2b763f1..b54ac8f3bb1 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPPartialSpecialization.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPPartialSpecialization.java @@ -14,7 +14,7 @@ package org.eclipse.cdt.core.dom.ast.cpp; /** * A partially specialized variable or class template. * - * @since 5.12 + * @since 6.0 */ public interface ICPPPartialSpecialization extends ICPPTemplateDefinition { public static final ICPPPartialSpecialization[] EMPTY_ARRAY = {}; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPPartiallySpecializable.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPPartiallySpecializable.java index 860b4599f9c..8d72efdce4b 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPPartiallySpecializable.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPPartiallySpecializable.java @@ -15,7 +15,7 @@ package org.eclipse.cdt.core.dom.ast.cpp; * Something that can be partially specialized. Hence, a class or a variable template * but not a function template. * - * @since 5.12 + * @since 6.0 */ public interface ICPPPartiallySpecializable extends ICPPTemplateDefinition { /** diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPVariableInstance.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPVariableInstance.java index 3710300af1e..394ae9f1fd2 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPVariableInstance.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPVariableInstance.java @@ -14,7 +14,7 @@ package org.eclipse.cdt.core.dom.ast.cpp; /** * Represents an instantiation or an explicit specialization of a variable template. * - * @since 5.12 + * @since 6.0 * @noextend This interface is not intended to be extended by clients. * @noimplement This interface is not intended to be implemented by clients. */ diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/IGCCASTAttributeList.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/IGCCASTAttributeList.java index e7c1bfb489c..a78bee37e5a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/IGCCASTAttributeList.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/IGCCASTAttributeList.java @@ -14,7 +14,7 @@ import org.eclipse.cdt.core.parser.util.InstanceOfPredicate; /** * Represents a GCC attribute specifier, introduced by __attribute__. * - * @since 5.12 + * @since 6.0 * @noextend This interface is not intended to be extended by clients. * @noimplement This interface is not intended to be implemented by clients. */ diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/cpp/AbstractCPPParserExtensionConfiguration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/cpp/AbstractCPPParserExtensionConfiguration.java index f2debff86f4..3a15ed915a2 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/cpp/AbstractCPPParserExtensionConfiguration.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/cpp/AbstractCPPParserExtensionConfiguration.java @@ -13,14 +13,14 @@ *******************************************************************************/ package org.eclipse.cdt.core.dom.parser.cpp; -import java.util.Collections; -import java.util.Map; - import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; import org.eclipse.cdt.core.parser.IToken.ContextSensitiveTokenType; import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.internal.core.dom.parser.GCCBuiltinSymbolProvider; +import java.util.Collections; +import java.util.Map; + /** * Abstract C++ parser extension configuration to help model C++ dialects. * @@ -63,7 +63,7 @@ public abstract class AbstractCPPParserExtensionConfiguration implements ICPPPar } /** - * @since 5.12 + * @since 6.0 */ @Override public boolean supportGCCStyleDesignators() { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/GCCKeywords.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/GCCKeywords.java index a553ae0e011..063317f33b0 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/GCCKeywords.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/GCCKeywords.java @@ -103,7 +103,7 @@ public class GCCKeywords { cp_decimal64= _DECIMAL64.toCharArray(), cp_decimal128= _DECIMAL128.toCharArray(); - /** @since 5.12 */ + /** @since 6.0 */ public static final char[] cp__is_trivially_copyable= "__is_trivially_copyable".toCharArray(), cp__is_trivially_constructible= "__is_trivially_constructible".toCharArray(), diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/IGCCToken.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/IGCCToken.java index a932f23e9a6..3133b574ea9 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/IGCCToken.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/IGCCToken.java @@ -55,7 +55,7 @@ public interface IGCCToken extends IToken { /** @since 5.10 */ int t_decimal64= FIRST_RESERVED_IGCCToken + 30; /** @since 5.10 */ int t_decimal128= FIRST_RESERVED_IGCCToken + 31; - /** @since 5.12 */ int tTT_is_trivially_copyable= FIRST_RESERVED_IGCCToken + 32; - /** @since 5.12 */ int tTT_is_trivially_constructible= FIRST_RESERVED_IGCCToken + 33; - /** @since 5.12 */ int tTT_is_trivially_assignable= FIRST_RESERVED_IGCCToken + 34; + /** @since 6.0 */ int tTT_is_trivially_copyable= FIRST_RESERVED_IGCCToken + 32; + /** @since 6.0 */ int tTT_is_trivially_constructible= FIRST_RESERVED_IGCCToken + 33; + /** @since 6.0 */ int tTT_is_trivially_assignable= FIRST_RESERVED_IGCCToken + 34; } diff --git a/core/org.eclipse.cdt.core/pom.xml b/core/org.eclipse.cdt.core/pom.xml index 3d945f79e87..768452fa115 100644 --- a/core/org.eclipse.cdt.core/pom.xml +++ b/core/org.eclipse.cdt.core/pom.xml @@ -11,7 +11,7 @@ ../../pom.xml - 5.12.0-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.cdt.core eclipse-plugin diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/Elf.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/Elf.java index 9deb1a37b44..4bfc5a58fba 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/Elf.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/Elf.java @@ -15,14 +15,6 @@ import static org.eclipse.cdt.internal.core.ByteUtils.makeInt; import static org.eclipse.cdt.internal.core.ByteUtils.makeLong; import static org.eclipse.cdt.internal.core.ByteUtils.makeShort; -import java.io.EOFException; -import java.io.IOException; -import java.nio.ByteBuffer; -import java.nio.channels.FileChannel.MapMode; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Comparator; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.IAddress; import org.eclipse.cdt.core.IAddressFactory; @@ -34,6 +26,14 @@ import org.eclipse.cdt.utils.Addr64Factory; import org.eclipse.cdt.utils.ERandomAccessFile; import org.eclipse.cdt.utils.debug.dwarf.DwarfReader; +import java.io.EOFException; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.nio.channels.FileChannel.MapMode; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Comparator; + public class Elf { public final static int ELF32_ADDR_SIZE = 4; public final static int ELF32_OFF_SIZE = 4; @@ -148,7 +148,7 @@ public class Elf { /** @since 5.4 */ public final static int EM_RL78 = 197; /* Renesas RL78 Microcontroller */ - /** @since 5.12 */ + /** @since 6.0 */ public final static int EM_AARCH64 = 183; public final static int EM_NIOS = 0xFEBB; diff --git a/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF index 3cb3d804704..bc93949aadd 100644 --- a/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF @@ -100,7 +100,7 @@ Export-Package: org.eclipse.cdt.internal.corext;x-internal:=true, org.eclipse.cdt.ui.wizards, org.eclipse.cdt.ui.wizards.conversion, org.eclipse.cdt.utils.ui.controls -Require-Bundle: org.eclipse.cdt.core;bundle-version="[5.2.0,6.0.0)", +Require-Bundle: org.eclipse.cdt.core;bundle-version="[5.2.0,7.0.0)", org.eclipse.compare;bundle-version="[3.3.0,4.0.0)", org.eclipse.core.expressions, org.eclipse.core.filesystem;bundle-version="[1.1.0,2.0.0)", diff --git a/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF index 9e7108a543b..8a71d077903 100644 --- a/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF +++ b/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF @@ -39,12 +39,12 @@ Export-Package: org.eclipse.cdt.debug.core, org.eclipse.cdt.dsf.ui, org.eclipse.cdt.tests.dsf.gdb", org.eclipse.cdt.debug.internal.core.srcfinder;x-internal:=true -Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)", - org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)", - org.eclipse.cdt.core;bundle-version="[5.0.0,6.0.0)", - org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", +Require-Bundle: org.eclipse.cdt.core;bundle-version="[5.0.0,7.0.0)", org.eclipse.core.filesystem;bundle-version="1.2.0", - org.eclipse.core.variables;bundle-version="3.2.0" + org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)", + org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", + org.eclipse.core.variables;bundle-version="3.2.0", + org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: com.ibm.icu.text diff --git a/debug/org.eclipse.cdt.debug.mi.core/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.mi.core/META-INF/MANIFEST.MF index 6cf365ac828..77a4f13a8a5 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/META-INF/MANIFEST.MF +++ b/debug/org.eclipse.cdt.debug.mi.core/META-INF/MANIFEST.MF @@ -21,7 +21,7 @@ Export-Package: org.eclipse.cdt.debug.mi.core, Require-Bundle: org.eclipse.cdt.debug.core;bundle-version="[7.0.0,8.1.0)", org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)", org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)", - org.eclipse.cdt.core;bundle-version="[5.0.0,6.0.0)", + org.eclipse.cdt.core;bundle-version="[5.0.0,7.0.0)", org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", org.eclipse.core.variables;bundle-version="3.2.200", org.eclipse.cdt.gdb;bundle-version="7.0.0" diff --git a/debug/org.eclipse.cdt.debug.mi.ui/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.mi.ui/META-INF/MANIFEST.MF index ba14e482c88..91a852543f7 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/META-INF/MANIFEST.MF +++ b/debug/org.eclipse.cdt.debug.mi.ui/META-INF/MANIFEST.MF @@ -14,18 +14,18 @@ Export-Package: org.eclipse.cdt.debug.mi.internal.ui;x-internal:=true, org.eclipse.cdt.debug.mi.ui, org.eclipse.cdt.debug.mi.ui.console, org.eclipse.cdt.debug.mi.ui.console.actions -Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)", - org.eclipse.ui;bundle-version="[3.2.0,4.0.0)", +Require-Bundle: org.eclipse.cdt.core;bundle-version="[5.0.0,7.0.0)", + org.eclipse.cdt.debug.core;bundle-version="[7.0.0,8.1.0)", org.eclipse.cdt.debug.mi.core;bundle-version="[7.0.0,8.1.0)", org.eclipse.cdt.debug.ui;bundle-version="[7.0.0,8.1.0)", - org.eclipse.cdt.debug.core;bundle-version="[7.0.0,8.1.0)", - org.eclipse.cdt.core;bundle-version="[5.0.0,6.0.0)", org.eclipse.cdt.ui;bundle-version="[6.0.0,7.0.0)", + org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)", + org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)", org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)", - org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", - org.eclipse.ui.console;bundle-version="[3.1.100,4.0.0)", - org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)" + org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)", + org.eclipse.ui;bundle-version="[3.2.0,4.0.0)", + org.eclipse.ui.console;bundle-version="[3.1.100,4.0.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: com.ibm.icu.text diff --git a/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF index 46be539dd18..2f0121e15aa 100644 --- a/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF +++ b/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF @@ -51,7 +51,7 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)", org.eclipse.debug.core;bundle-version="[3.7.0,4.0.0)", org.eclipse.cdt.debug.core;bundle-version="[7.0.0,8.1.0)", org.eclipse.cdt.ui;bundle-version="[6.0.0,7.0.0)", - org.eclipse.cdt.core;bundle-version="[5.0.0,6.0.0)", + org.eclipse.cdt.core;bundle-version="[5.0.0,7.0.0)", org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", org.eclipse.ui.console;bundle-version="[3.1.100,4.0.0)", org.eclipse.ui.views;bundle-version="[3.2.0,4.0.0)", diff --git a/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF b/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF index e036518bbd5..8591191d7cc 100644 --- a/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF +++ b/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF @@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)", org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)", org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)", org.eclipse.ui;bundle-version="[3.2.0,4.0.0)", - org.eclipse.cdt.core;bundle-version="[5.0.0,6.0.0)", + org.eclipse.cdt.core;bundle-version="[5.0.0,7.0.0)", org.eclipse.cdt.ui;bundle-version="[6.0.0,7.0.0)", org.eclipse.cdt.debug.core;bundle-version="[7.0.0,8.1.0)", org.eclipse.cdt.debug.ui;bundle-version="[7.0.0,8.1.0)",