Move RADIX_TYPE enum into its own header to fix compilation error and reduce dependencies from RadixToStringConverter

This commit is contained in:
Josh Koon 2019-02-20 10:06:25 -08:00
commit 4d47083a43
6 changed files with 20 additions and 11 deletions

View file

@ -279,6 +279,7 @@
<ClInclude Include="Header Files\CalcInput.h" /> <ClInclude Include="Header Files\CalcInput.h" />
<ClInclude Include="Header Files\IHistoryDisplay.h" /> <ClInclude Include="Header Files\IHistoryDisplay.h" />
<ClInclude Include="Header Files\Number.h" /> <ClInclude Include="Header Files\Number.h" />
<ClInclude Include="Header Files\RadixType.h" />
<ClInclude Include="Header Files\Rational.h" /> <ClInclude Include="Header Files\Rational.h" />
<ClInclude Include="Header Files\scimath.h" /> <ClInclude Include="Header Files\scimath.h" />
<ClInclude Include="pch.h" /> <ClInclude Include="pch.h" />

View file

@ -161,5 +161,8 @@
<ClInclude Include="Header Files\Rational.h"> <ClInclude Include="Header Files\Rational.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Header Files\RadixType.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
</Project> </Project>

View file

@ -20,6 +20,7 @@
#include "../Command.h" #include "../Command.h"
#include "../CalculatorVector.h" #include "../CalculatorVector.h"
#include "../ExpressionCommand.h" #include "../ExpressionCommand.h"
#include "RadixType.h"
#include "History.h" // for History Collector #include "History.h" // for History Collector
#include "CalcInput.h" #include "CalcInput.h"
#include "ICalcDisplay.h" #include "ICalcDisplay.h"
@ -38,15 +39,6 @@ enum eNUM_WIDTH {
typedef enum eNUM_WIDTH NUM_WIDTH; typedef enum eNUM_WIDTH NUM_WIDTH;
static constexpr size_t NUM_WIDTH_LENGTH = 4; static constexpr size_t NUM_WIDTH_LENGTH = 4;
// This is expected to be in same order as IDM_HEX, IDM_DEC, IDM_OCT, IDM_BIN
enum eRADIX_TYPE {
HEX_RADIX,
DEC_RADIX,
OCT_RADIX,
BIN_RADIX
};
typedef enum eRADIX_TYPE RADIX_TYPE;
namespace CalculationManager namespace CalculationManager
{ {
class IResourceProvider; class IResourceProvider;

View file

@ -2,7 +2,7 @@
#pragma once #pragma once
#include "RatPack/ratpak.h" #include "Ratpack/ratpak.h"
namespace CalcEngine namespace CalcEngine
{ {

View file

@ -0,0 +1,13 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
#pragma once
// This is expected to be in same order as IDM_HEX, IDM_DEC, IDM_OCT, IDM_BIN
enum eRADIX_TYPE {
HEX_RADIX,
DEC_RADIX,
OCT_RADIX,
BIN_RADIX
};
typedef enum eRADIX_TYPE RADIX_TYPE;

View file

@ -3,7 +3,7 @@
#include "pch.h" #include "pch.h"
#include "RadixToStringConverter.h" #include "RadixToStringConverter.h"
#include "CalcManager/Header Files/CalcEngine.h" #include "CalcManager/Header Files/RadixType.h"
#include "CalcViewModel/Common/AppResourceProvider.h" #include "CalcViewModel/Common/AppResourceProvider.h"
using namespace Platform; using namespace Platform;