From 05625c43cfc91be5cb168aa0345f2d2c1dc45214 Mon Sep 17 00:00:00 2001 From: Nathan Ridge Date: Mon, 12 Dec 2016 15:49:00 -0500 Subject: [PATCH] Fix a bug in the indexer's post-process Some of the PDOMNode initData() methods clobbered each other by overriding each other. Fixed by renaming relevant ones to initConstructorData(). Change-Id: Ib290dcd861d6aff5466520886bc3c5433b4a269b --- .../core/pdom/dom/cpp/PDOMCPPConstructorInstance.java | 3 +-- .../core/pdom/dom/cpp/PDOMCPPConstructorSpecialization.java | 3 +-- .../dom/cpp/PDOMCPPConstructorTemplateSpecialization.java | 3 +-- .../cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java | 6 +++--- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructorInstance.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructorInstance.java index c2a6d6e8beb..dc5b7aad391 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructorInstance.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructorInstance.java @@ -47,8 +47,7 @@ public class PDOMCPPConstructorInstance extends PDOMCPPMethodInstance super(linkage, bindingRecord); } - @Override - public void initData(ICPPExecution constructorChain) { + public void initConstructorData(ICPPExecution constructorChain) { if (constructorChain == null) return; try { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructorSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructorSpecialization.java index 252c464f130..3af7534a2c3 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructorSpecialization.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructorSpecialization.java @@ -47,8 +47,7 @@ class PDOMCPPConstructorSpecialization extends PDOMCPPMethodSpecialization super(linkage, bindingRecord); } - @Override - public void initData(ICPPExecution constructorChain) { + public void initConstructorData(ICPPExecution constructorChain) { if (constructorChain == null) return; try { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructorTemplateSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructorTemplateSpecialization.java index f74d5074854..d6a9e04c46a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructorTemplateSpecialization.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructorTemplateSpecialization.java @@ -45,8 +45,7 @@ class PDOMCPPConstructorTemplateSpecialization extends PDOMCPPMethodTemplateSpec super(linkage, bindingRecord); } - @Override - public void initData(ICPPExecution constructorChain) { + public void initConstructorData(ICPPExecution constructorChain) { if (constructorChain == null) return; try { 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 6c90a2a25c0..f4c622e3088 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 @@ -355,7 +355,7 @@ class PDOMCPPLinkage extends PDOMLinkage implements IIndexCPPBindingConstants { @Override public void run() { - fConstructor.initData(fConstructorChain); + fConstructor.initConstructorData(fConstructorChain); } } @@ -388,7 +388,7 @@ class PDOMCPPLinkage extends PDOMLinkage implements IIndexCPPBindingConstants { @Override public void run() { - fConstructor.initData(fConstructorChain); + fConstructor.initConstructorData(fConstructorChain); } } @@ -454,7 +454,7 @@ class PDOMCPPLinkage extends PDOMLinkage implements IIndexCPPBindingConstants { @Override public void run() { - fConstructor.initData(fConstructorChain); + fConstructor.initConstructorData(fConstructorChain); } }