DevWiki/calculator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix type of m_openParenCount (#550)

Browse Source 
m_openParenCount is always used as unsigned and compared against unsigneds
This commit is contained in:
Michał Janiszewski
2019-06-18 02:10:15 +02:00
committed by Matt Cooley
parent dab589b3e0
commit da9f4ea856
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/CalcManager/CEngine/scicomm.cpp
View File

@@ -373,7 +373,8 @@ void CCalcEngine::ProcessCommandWorker(OpCode wParam)
m_lastVal = 0; m_lastVal = 0;
m_bChangeOp = false; m_bChangeOp = false;
m_precedenceOpCount = m_nTempCom = m_nLastCom = m_nOpCode = m_openParenCount = 0; m_openParenCount = 0;
m_precedenceOpCount = m_nTempCom = m_nLastCom = m_nOpCode = 0;
m_nPrevOpCode = 0; m_nPrevOpCode = 0;
m_bNoPrevEqu = true; m_bNoPrevEqu = true;

2
src/CalcManager/Header Files/CalcEngine.h
View File

@@ -138,7 +138,7 @@ private:
std::wstring m_numberString; std::wstring m_numberString;
int m_nTempCom; /* Holding place for the last command. */ int m_nTempCom; /* Holding place for the last command. */
int m_openParenCount; // Number of open parentheses. size_t m_openParenCount; // Number of open parentheses.
std::array<int, MAXPRECDEPTH> m_nOp; /* Holding array for parenthesis operations. */ std::array<int, MAXPRECDEPTH> m_nOp; /* Holding array for parenthesis operations. */
std::array<int, MAXPRECDEPTH> m_nPrecOp; /* Holding array for precedence operations. */ std::array<int, MAXPRECDEPTH> m_nPrecOp; /* Holding array for precedence operations. */
size_t m_precedenceOpCount; /* Current number of precedence ops in holding. */ size_t m_precedenceOpCount; /* Current number of precedence ops in holding. */