diff options
| author | Nathan Ridge | 2013-09-07 06:51:25 +0000 |
|---|---|---|
| committer | Sergey Prigogin | 2013-09-07 19:24:11 +0000 |
| commit | e8cf0cdce945b8c0217c636002c0979ba31a0a8b (patch) | |
| tree | 55b65afdb77ab1e7ed47c576a4854131d7908217 | |
| parent | 3bf07e8a61e42c8c7c004b72d885cb3e1c4dca71 (diff) | |
| download | org.eclipse.cdt-e8cf0cdce945b8c0217c636002c0979ba31a0a8b.tar.gz org.eclipse.cdt-e8cf0cdce945b8c0217c636002c0979ba31a0a8b.tar.xz org.eclipse.cdt-e8cf0cdce945b8c0217c636002c0979ba31a0a8b.zip | |
Bug 414279 - Fix an NPE
Change-Id: Ib2ec70e74bc56364dbaf3756162626683eba70e1
Signed-off-by: Nathan Ridge <zeratul976@hotmail.com>
Reviewed-on: https://git.eclipse.org/r/16201
Reviewed-by: Sergey Prigogin <eclipse.sprigogin@gmail.com>
IP-Clean: 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/semantics/CPPVisitor.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java index 57a23396f58..5230be61a46 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java @@ -855,7 +855,8 @@ public class CPPVisitor extends ASTQueries { if (function.getOwner() instanceof ICPPClassType) { // Don't consider a function brought into scope from a base class scope // to be the same as a function declared in a derived class scope. - if (!((ICPPClassType) function.getOwner()).getCompositeScope().equals(scope)) { + IScope bindingScope = ((ICPPClassType) function.getOwner()).getCompositeScope(); + if (bindingScope == null || !bindingScope.equals(scope)) { sameFunction = false; } } |