Fix some code analysis warnings in CalcManager (#1074)

This commit is contained in:
Matt Cooley 2020-03-30 15:23:22 -07:00 committed by GitHub
parent cf735bbcf5
commit f552428d97
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
30 changed files with 225 additions and 219 deletions

View file

@ -29,11 +29,11 @@ CalcEngine::Rational CCalcEngine::DoOperation(int operation, CalcEngine::Rationa
break;
case IDC_NAND:
result = (result & rhs) ^ m_chopNumbers[m_numwidth];
result = (result & rhs) ^ GetChopNumber();
break;
case IDC_NOR:
result = (result | rhs) ^ m_chopNumbers[m_numwidth];
result = (result | rhs) ^ GetChopNumber();
break;
case IDC_RSHF:
@ -53,10 +53,10 @@ CalcEngine::Rational CCalcEngine::DoOperation(int operation, CalcEngine::Rationa
{
result = Integer(result);
auto tempRat = m_chopNumbers[m_numwidth] >> holdVal;
auto tempRat = GetChopNumber() >> holdVal;
tempRat = Integer(tempRat);
result |= tempRat ^ m_chopNumbers[m_numwidth];
result |= tempRat ^ GetChopNumber();
}
break;
}
@ -105,7 +105,7 @@ CalcEngine::Rational CCalcEngine::DoOperation(int operation, CalcEngine::Rationa
if (fMsb)
{
result = (rhs ^ m_chopNumbers[m_numwidth]) + 1;
result = (rhs ^ GetChopNumber()) + 1;
iNumeratorSign = -1;
}
@ -115,7 +115,7 @@ CalcEngine::Rational CCalcEngine::DoOperation(int operation, CalcEngine::Rationa
if (fMsb)
{
temp = (temp ^ m_chopNumbers[m_numwidth]) + 1;
temp = (temp ^ GetChopNumber()) + 1;
iDenominatorSign = -1;
}