diff options
| author | Nathan Ridge | 2017-09-19 04:11:38 +0000 |
|---|---|---|
| committer | Nathan Ridge | 2017-09-25 16:49:38 +0000 |
| commit | 9869cbc9bacf716995a616434f9d635928dcca01 (patch) | |
| tree | 100eee8e5e5367a2623dfb1d32b52f8ea3ac7ad6 /core/org.eclipse.cdt.ui/src | |
| parent | 2a94c462098bef0aed8f7c214147d641a1bfb6c5 (diff) | |
| download | org.eclipse.cdt-9869cbc9bacf716995a616434f9d635928dcca01.tar.gz org.eclipse.cdt-9869cbc9bacf716995a616434f9d635928dcca01.tar.xz org.eclipse.cdt-9869cbc9bacf716995a616434f9d635928dcca01.zip | |
Bug 522461 - NPE in ParameterGuesser.createVariable()
Change-Id: I68c2588866c9b4228134643bfa246452ee483c80
Diffstat (limited to 'core/org.eclipse.cdt.ui/src')
| -rw-r--r-- | core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ParameterGuesser.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ParameterGuesser.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ParameterGuesser.java index 0a844ada7ca..4f579d87f59 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ParameterGuesser.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ParameterGuesser.java @@ -145,7 +145,7 @@ public class ParameterGuesser { throws CModelException { IType elementType = getType(element); String elementName = element.getName(); - if (elementType != null + if (elementType != null && enclosingType != null && (elementType.toString().equals(enclosingType.toString()) || elementType.isSameType(enclosingType) || isImplicitlyConvertible(enclosingType, elementType, ast) |