Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Ridge2014-08-24 06:22:48 +0000
committerSergey Prigogin2014-08-27 21:41:34 +0000
commit60290def38c61da8393b3bcf78d8784baca8b04e (patch)
treeee1d0eb802df5ff154fe9593804de41fb8d95338
parent1002bcdf78989d71834a2a748d7ac258d7c2a10c (diff)
downloadorg.eclipse.cdt-60290def38c61da8393b3bcf78d8784baca8b04e.tar.gz
org.eclipse.cdt-60290def38c61da8393b3bcf78d8784baca8b04e.tar.xz
org.eclipse.cdt-60290def38c61da8393b3bcf78d8784baca8b04e.zip
Bug 439923 - Fix an assertion failure in
AbstractCPPClassSpecializationScope.getBindings() Change-Id: I4f6485b016d87d98fc980adf8c0dce9fa139aecf Signed-off-by: Nathan Ridge <zeratul976@hotmail.com> Reviewed-on: https://git.eclipse.org/r/32203 Tested-by: Hudson CI Reviewed-by: Sergey Prigogin <eclipse.sprigogin@gmail.com> Tested-by: Sergey Prigogin <eclipse.sprigogin@gmail.com>
-rw-r--r--core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/AbstractCPPClassSpecializationScope.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/AbstractCPPClassSpecializationScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/AbstractCPPClassSpecializationScope.java
index 9c7c0588d5f..6015a27bde8 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/AbstractCPPClassSpecializationScope.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/AbstractCPPClassSpecializationScope.java
@@ -129,7 +129,8 @@ public class AbstractCPPClassSpecializationScope implements ICPPClassSpecializat
} else {
binding= specialClass.specializeMember(binding, lookup.getLookupPoint());
}
- result = ArrayUtil.appendAt(result, n++, binding);
+ if (binding != null)
+ result = ArrayUtil.appendAt(result, n++, binding);
}
return ArrayUtil.trim(result, n);
}

Back to the top