diff --git a/core/org.eclipse.cdt.core/index/ChangeLog b/core/org.eclipse.cdt.core/index/ChangeLog index 74078e8db8e..b33421b72c8 100644 --- a/core/org.eclipse.cdt.core/index/ChangeLog +++ b/core/org.eclipse.cdt.core/index/ChangeLog @@ -1,3 +1,8 @@ +2004-11-02 Bogdan Gheorghe + Fixed a bug in the index merge. + + * index/org/eclipse/cdt/internal/core/index/impl/MergeFactory.java + 2004-11-02 Bogdan Gheorghe Partial Fix for Bug 74427: Indexer needs to store more info diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/MergeFactory.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/MergeFactory.java index f7e83c14969..8f182db6ac8 100644 --- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/MergeFactory.java +++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/MergeFactory.java @@ -210,6 +210,7 @@ public class MergeFactory { addsInput.moveToNextWordEntry(); } else { word1.catRefs(word1); + word2.catRefs(word2); word1.mapRefs(mappingOld); word2.mapRefs(mappingAdds); word1.addRefs(word2.getRefs(),word2.getRefsIndexFlags());