From da9f4ea85637c0366a35db059b750403dd53dd00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Tue, 18 Jun 2019 02:10:15 +0200 Subject: [PATCH] Fix type of m_openParenCount (#550) m_openParenCount is always used as unsigned and compared against unsigneds --- src/CalcManager/CEngine/scicomm.cpp | 3 ++- src/CalcManager/Header Files/CalcEngine.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/CalcManager/CEngine/scicomm.cpp b/src/CalcManager/CEngine/scicomm.cpp index eabb7f94..c199501f 100644 --- a/src/CalcManager/CEngine/scicomm.cpp +++ b/src/CalcManager/CEngine/scicomm.cpp @@ -373,7 +373,8 @@ void CCalcEngine::ProcessCommandWorker(OpCode wParam) m_lastVal = 0; 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_bNoPrevEqu = true; diff --git a/src/CalcManager/Header Files/CalcEngine.h b/src/CalcManager/Header Files/CalcEngine.h index 03a5437e..9da57627 100644 --- a/src/CalcManager/Header Files/CalcEngine.h +++ b/src/CalcManager/Header Files/CalcEngine.h @@ -138,7 +138,7 @@ private: std::wstring m_numberString; 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 m_nOp; /* Holding array for parenthesis operations. */ std::array m_nPrecOp; /* Holding array for precedence operations. */ size_t m_precedenceOpCount; /* Current number of precedence ops in holding. */