diff options
author | Doug Schaefer | 2013-02-27 04:08:13 +0000 |
---|---|---|
committer | Doug Schaefer | 2013-02-27 04:08:13 +0000 |
commit | 9c4d88dab487ddb2ab594bf88743199775d24559 (patch) | |
tree | 83122b0246fbf272c11ba2da0da76b936009a866 | |
parent | 6c6ab24c2355b454aa529361c9e0ee06d4166d35 (diff) | |
download | org.eclipse.cdt-9c4d88dab487ddb2ab594bf88743199775d24559.tar.gz org.eclipse.cdt-9c4d88dab487ddb2ab594bf88743199775d24559.tar.xz org.eclipse.cdt-9c4d88dab487ddb2ab594bf88743199775d24559.zip |
Fix up a few formatting things and the version number for tags.
3 files changed, 5 insertions, 6 deletions
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/AbstractIndexerTask.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/AbstractIndexerTask.java index df417262095..29c316206de 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/AbstractIndexerTask.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/AbstractIndexerTask.java @@ -1008,7 +1008,7 @@ public abstract class AbstractIndexerTask extends PDOMWriter { if (ast != null) { // Give the new AST-TU a chance to recognize its translation unit before it is written // to the index. - ( (ASTTranslationUnit)ast ).setOriginatingTranslationUnit( (ITranslationUnit)tu ); + ((ASTTranslationUnit)ast).setOriginatingTranslationUnit((ITranslationUnit)tu); writeToIndex(lang.getLinkageID(), ast, codeReader, ctx, pm); } } catch (CoreException e) { 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 5c59fbcba75..b56e4eb9fac 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 @@ -465,10 +465,9 @@ public class PDOM extends PlatformObject implements IPDOM { } public PDOMTagIndex getTagIndex() throws CoreException { - if (tagIndex == null) - { - // tag index can only be stored in database versions 139.1 or greater - tagIndex = new PDOMTagIndex( db.getVersion() >= version( 139, 1 ) ? db : null, TAG_INDEX ); + if (tagIndex == null) { + // tag index can only be stored in database versions 140.1 or greater + tagIndex = new PDOMTagIndex(db.getVersion() >= version(140, 1) ? db : null, TAG_INDEX); } return tagIndex; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java index 3d85ab48e7f..b07afe54c2e 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java @@ -378,7 +378,7 @@ class PDOMCPPLinkage extends PDOMLinkage implements IIndexCPPBindingConstants { // Update the tags based on the tags from the new binding. This was in PDOMBinding.update, but // I found that not all subclasses (e.g., PDOMCPPFunction) call the parent implementation. - TagManager.getInstance().syncTags( pdomBinding, fromBinding ); + TagManager.getInstance().syncTags(pdomBinding, fromBinding); } return pdomBinding; |