summaryrefslogtreecommitdiff
path: root/idlc/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-02-15 12:24:29 +0000
committerCaolán McNamara <caolanm@redhat.com>2011-02-15 15:55:19 +0000
commit7a14639359f553dfd0c526f7d005867ef2b04c72 (patch)
tree79c11c48f870174c5312392679bd759f77a6d305 /idlc/source
parentf091f5b395cc462a01a52aa7b535202e8b232463 (diff)
silence a windows warning
Diffstat (limited to 'idlc/source')
-rw-r--r--idlc/source/astexpression.cxx31
1 files changed, 16 insertions, 15 deletions
diff --git a/idlc/source/astexpression.cxx b/idlc/source/astexpression.cxx
index 394bb848bdd1..f505e081aa44 100644
--- a/idlc/source/astexpression.cxx
+++ b/idlc/source/astexpression.cxx
@@ -800,42 +800,43 @@ void AstExpression::evaluate(EvalKind ek)
sal_Bool AstExpression::operator==(AstExpression *pExpr)
{
+ sal_Bool bRet = sal_False;
if (m_combOperator != pExpr->getCombOperator())
- return sal_False;
+ return bRet;
evaluate(EK_const);
pExpr->evaluate(EK_const);
if (m_exprValue == NULL || pExpr->getExprValue() == NULL)
- return sal_False;
+ return bRet;
if (m_exprValue->et != pExpr->getExprValue()->et)
- return sal_False;
+ return bRet;
switch (m_exprValue->et)
{
case ET_short:
- return (m_exprValue->u.sval == pExpr->getExprValue()->u.sval) ? sal_True : sal_False;
+ bRet = (m_exprValue->u.sval == pExpr->getExprValue()->u.sval) ? sal_True : sal_False;
case ET_ushort:
- return (m_exprValue->u.usval == pExpr->getExprValue()->u.usval) ? sal_True : sal_False;
+ bRet = (m_exprValue->u.usval == pExpr->getExprValue()->u.usval) ? sal_True : sal_False;
case ET_long:
- return (m_exprValue->u.lval == pExpr->getExprValue()->u.lval) ? sal_True : sal_False;
+ bRet = (m_exprValue->u.lval == pExpr->getExprValue()->u.lval) ? sal_True : sal_False;
case ET_ulong:
- return (m_exprValue->u.ulval == pExpr->getExprValue()->u.ulval) ? sal_True : sal_False;
+ bRet = (m_exprValue->u.ulval == pExpr->getExprValue()->u.ulval) ? sal_True : sal_False;
case ET_hyper:
- return (m_exprValue->u.hval == pExpr->getExprValue()->u.hval) ? sal_True : sal_False;
+ bRet = (m_exprValue->u.hval == pExpr->getExprValue()->u.hval) ? sal_True : sal_False;
case ET_uhyper:
- return (m_exprValue->u.uhval == pExpr->getExprValue()->u.uhval) ? sal_True : sal_False;
+ bRet = (m_exprValue->u.uhval == pExpr->getExprValue()->u.uhval) ? sal_True : sal_False;
case ET_float:
- return (m_exprValue->u.fval == pExpr->getExprValue()->u.fval) ? sal_True : sal_False;
+ bRet = (m_exprValue->u.fval == pExpr->getExprValue()->u.fval) ? sal_True : sal_False;
case ET_double:
- return (m_exprValue->u.dval == pExpr->getExprValue()->u.dval) ? sal_True : sal_False;
+ bRet = (m_exprValue->u.dval == pExpr->getExprValue()->u.dval) ? sal_True : sal_False;
case ET_byte:
- return (m_exprValue->u.byval == pExpr->getExprValue()->u.byval) ? sal_True : sal_False;
+ bRet = (m_exprValue->u.byval == pExpr->getExprValue()->u.byval) ? sal_True : sal_False;
case ET_boolean:
- return (m_exprValue->u.lval == pExpr->getExprValue()->u.lval) ? sal_True : sal_False;
+ bRet = (m_exprValue->u.lval == pExpr->getExprValue()->u.lval) ? sal_True : sal_False;
default:
OSL_ASSERT(false);
- return sal_False;
+ bRet = sal_False;
}
- return sal_False;
+ return bRet;
}
sal_Bool AstExpression::compare(AstExpression *pExpr)