diff --git a/core/org.eclipse.cdt.core/.settings/.api_filters b/core/org.eclipse.cdt.core/.settings/.api_filters deleted file mode 100644 index b93964e5a8c..00000000000 --- a/core/org.eclipse.cdt.core/.settings/.api_filters +++ /dev/null @@ -1,153 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IScope.java index c935319df4d..e5910affecf 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IScope.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IScope.java @@ -101,7 +101,7 @@ public interface IScope { /** - * @since 5.4 + * @since 5.5 * @noextend This class is not intended to be subclassed by clients. */ public static class ScopeLookupData { @@ -186,7 +186,7 @@ public interface IScope { * have not yet been resolved. * * @return : the bindings in this scope that match the name or prefix, or null - * @since 5.4 + * @since 5.5 */ public IBinding[] getBindings(ScopeLookupData lookup); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTArraySubscriptExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTArraySubscriptExpression.java index ca43396ec3d..d0e61fa0ba3 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTArraySubscriptExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTArraySubscriptExpression.java @@ -31,13 +31,13 @@ public interface ICPPASTArraySubscriptExpression extends IASTArraySubscriptExpre public ICPPASTArraySubscriptExpression copy(CopyStyle style); /** - * @since 5.4 + * @since 5.5 */ @Override public ICPPASTExpression getArrayExpression(); /** - * @since 5.4 + * @since 5.5 */ @Override public ICPPASTInitializerClause getArgument(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTExpression.java index 7674c43cc24..1805ce597a1 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTExpression.java @@ -17,7 +17,7 @@ import org.eclipse.cdt.core.dom.ast.IASTExpression; * Interface for c++ expressions. * @noextend This interface is not intended to be extended by clients. * @noimplement This interface is not intended to be implemented by clients. - * @since 5.4 + * @since 5.5 */ public interface ICPPASTExpression extends IASTExpression, ICPPASTInitializerClause { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFieldReference.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFieldReference.java index 2697932bbe0..645487cfa05 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFieldReference.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFieldReference.java @@ -54,7 +54,7 @@ public interface ICPPASTFieldReference extends IASTFieldReference, ICPPASTExpres public IType getFieldOwnerType(); /** - * @since 5.4 + * @since 5.5 */ @Override public ICPPASTExpression getFieldOwner(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTInitializerClause.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTInitializerClause.java index 80b48a34b53..03d7ede44de 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTInitializerClause.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTInitializerClause.java @@ -18,7 +18,7 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPEvaluation; * C++ specific initializer clause * @noextend This interface is not intended to be extended by clients. * @noimplement This interface is not intended to be implemented by clients. - * @since 5.4 + * @since 5.5 */ public interface ICPPASTInitializerClause extends IASTInitializerClause { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPClassSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPClassSpecialization.java index 2fd3cdd2fa8..0a9d97a11b7 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPClassSpecialization.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPClassSpecialization.java @@ -34,7 +34,7 @@ public interface ICPPClassSpecialization extends ICPPSpecialization, ICPPClassTy /** * Creates a specialized binding for a member of the original class. The result is * a member of this class specialization. - * @since 5.4 + * @since 5.5 */ IBinding specializeMember(IBinding binding, IASTNode point); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOM.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOM.java index b7f081a4cc9..351dfbdd294 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOM.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOM.java @@ -216,11 +216,14 @@ public class PDOM extends PlatformObject implements IPDOM { * 122.0 - Compacting strings * 123.0 - Combined file size and encoding hash code. * 124.0 - GCC attributes and NO_RETURN flag for functions. - * 125.0 - Indexes for unresolved includes and files indexed with I/O errors. + * #125.0# - Indexes for unresolved includes and files indexed with I/O errors. <> + * + * CDT 8.2 development + * 130.0 - Dependent expressions, bug 299911 */ - private static final int MIN_SUPPORTED_VERSION= version(125, 0); - private static final int MAX_SUPPORTED_VERSION= version(125, Short.MAX_VALUE); - private static final int DEFAULT_VERSION = version(125, 0); + private static final int MIN_SUPPORTED_VERSION= version(130, 0); + private static final int MAX_SUPPORTED_VERSION= version(130, Short.MAX_VALUE); + private static final int DEFAULT_VERSION = version(130, 0); private static int version(int major, int minor) { return (major << 16) + minor; @@ -320,11 +323,11 @@ public class PDOM extends PlatformObject implements IPDOM { private BTree fileIndex; private BTree indexOfDefectiveFiles; private BTree indexOfFiledWithUnresolvedIncludes; - private Map fLinkageIDCache = new HashMap(); + private final Map fLinkageIDCache = new HashMap(); private File fPath; - private IIndexLocationConverter locationConverter; - private Map fPDOMLinkageFactoryCache; - private HashMap fResultCache= new HashMap(); + private final IIndexLocationConverter locationConverter; + private final Map fPDOMLinkageFactoryCache; + private final HashMap fResultCache= new HashMap(); private List listeners; protected ChangeEvent fEvent= new ChangeEvent(); @@ -606,10 +609,10 @@ public class PDOM extends PlatformObject implements IPDOM { private final ArrayList currentPath= new ArrayList(); private final ArrayList matchStack= new ArrayList(); - private List bindings = new ArrayList(); - private boolean isFullyQualified; + private final List bindings = new ArrayList(); + private final boolean isFullyQualified; private BitSet matchesUpToLevel; - private IndexFilter filter; + private final IndexFilter filter; public BindingFinder(Pattern[] pattern, boolean isFullyQualified, IndexFilter filter, IProgressMonitor monitor) { this.pattern = pattern; @@ -893,7 +896,7 @@ public class PDOM extends PlatformObject implements IPDOM { // Read-write lock rules. Readers don't conflict with other readers, // Writers conflict with readers, and everyone conflicts with writers. - private Object mutex = new Object(); + private final Object mutex = new Object(); private int lockCount; private int waitingReaders; private long lastWriteAccess= 0; diff --git a/core/org.eclipse.cdt.ui/.settings/.api_filters b/core/org.eclipse.cdt.ui/.settings/.api_filters deleted file mode 100644 index 794eadd4c2e..00000000000 --- a/core/org.eclipse.cdt.ui/.settings/.api_filters +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF index b90b6aa0a12..97c42faf3fe 100644 --- a/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.ui; singleton:=true -Bundle-Version: 5.4.0.qualifier +Bundle-Version: 5.5.0.qualifier Bundle-Activator: org.eclipse.cdt.ui.CUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/core/org.eclipse.cdt.ui/pom.xml b/core/org.eclipse.cdt.ui/pom.xml index cc5f654078f..27c27cf9f40 100644 --- a/core/org.eclipse.cdt.ui/pom.xml +++ b/core/org.eclipse.cdt.ui/pom.xml @@ -11,7 +11,7 @@ ../../pom.xml - 5.4.0-SNAPSHOT + 5.5.0-SNAPSHOT org.eclipse.cdt.ui eclipse-plugin