From 9e2fb6a53afd281ee4543fbec1ef8081e98d81ea Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Wed, 1 Aug 2012 19:58:48 -0700 Subject: [PATCH] Bug 299911. Minor fix. --- .../cdt/internal/core/dom/parser/cpp/semantics/EvalBinary.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalBinary.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalBinary.java index 625fe770542..7eb375ebeb2 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalBinary.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalBinary.java @@ -12,7 +12,6 @@ package org.eclipse.cdt.internal.core.dom.parser.cpp.semantics; import static org.eclipse.cdt.core.dom.ast.IASTBinaryExpression.op_assign; -import static org.eclipse.cdt.core.dom.ast.IASTBinaryExpression.op_binaryAnd; import static org.eclipse.cdt.core.dom.ast.IASTBinaryExpression.op_binaryAndAssign; import static org.eclipse.cdt.core.dom.ast.IASTBinaryExpression.op_binaryOrAssign; import static org.eclipse.cdt.core.dom.ast.IASTBinaryExpression.op_binaryXorAssign; @@ -156,7 +155,7 @@ public class EvalBinary extends CPPEvaluation { Long num1 = v1.numericalValue(); if (num1 != null) { if (num1 == 0) { - if (fOperator == op_binaryAnd || fOperator == op_logicalAnd) + if (fOperator == op_logicalAnd) return v1; } else if (fOperator == op_logicalOr) { return v1;