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

Fix order of initialization list in CalculatorManager, COpndCommand (#332)

Browse Source 
This ensures the initialization order matches the layout of member
fields in class declaration
This commit is contained in:
Michał Janiszewski 2019-03-21 00:45:30 +01:00 committed by Howard Wolosky
parent 426a6c058d
commit 597caf9c6b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/CalcManager/CalculatorManager.cpp
View File

@ -24,15 +24,15 @@ namespace CalculationManager
{ {
CalculatorManager::CalculatorManager(_In_ ICalcDisplay* displayCallback, _In_ IResourceProvider* resourceProvider) : CalculatorManager::CalculatorManager(_In_ ICalcDisplay* displayCallback, _In_ IResourceProvider* resourceProvider) :
m_displayCallback(displayCallback), m_displayCallback(displayCallback),
m_currentCalculatorEngine(nullptr),
m_resourceProvider(resourceProvider), m_resourceProvider(resourceProvider),
m_inHistoryItemLoadMode(false),
m_persistedPrimaryValue(),
m_isExponentialFormat(false),
m_currentDegreeMode(Command::CommandNULL), m_currentDegreeMode(Command::CommandNULL),
m_savedDegreeMode(Command::CommandDEG), m_savedDegreeMode(Command::CommandDEG),
m_isExponentialFormat(false),
m_persistedPrimaryValue(),
m_currentCalculatorEngine(nullptr),
m_pStdHistory(new CalculatorHistory(MAX_HISTORY_ITEMS)), m_pStdHistory(new CalculatorHistory(MAX_HISTORY_ITEMS)),
m_pSciHistory(new CalculatorHistory(MAX_HISTORY_ITEMS)), m_pSciHistory(new CalculatorHistory(MAX_HISTORY_ITEMS))
m_inHistoryItemLoadMode(false)
{ {
CCalcEngine::InitialOneTimeOnlySetup(*m_resourceProvider); CCalcEngine::InitialOneTimeOnlySetup(*m_resourceProvider);
} }

2
src/CalcManager/ExpressionCommand.cpp
View File

@ -98,8 +98,8 @@ void CBinaryCommand::Accept(_In_ ISerializeCommandVisitor &commandVisitor)
COpndCommand::COpndCommand(shared_ptr<CalculatorVector<int>> const &commands, bool fNegative, bool fDecimal, bool fSciFmt) : COpndCommand::COpndCommand(shared_ptr<CalculatorVector<int>> const &commands, bool fNegative, bool fDecimal, bool fSciFmt) :
m_commands(commands), m_commands(commands),
m_fNegative(fNegative), m_fNegative(fNegative),
m_fDecimal(fDecimal),
m_fSciFmt(fSciFmt), m_fSciFmt(fSciFmt),
m_fDecimal(fDecimal),
m_fInitialized(false), m_fInitialized(false),
m_value{} m_value{}
{} {}