diff --git a/src/CalcManager/CalcManager.vcxproj b/src/CalcManager/CalcManager.vcxproj index 21505fea..e47cea17 100644 --- a/src/CalcManager/CalcManager.vcxproj +++ b/src/CalcManager/CalcManager.vcxproj @@ -141,7 +141,7 @@ Use false true - /Zm250 /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 %(AdditionalOptions) + /Zm250 /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 /w44242 %(AdditionalOptions) $(SolutionDir)..\src\;%(AdditionalIncludeDirectories) Level4 true @@ -158,7 +158,7 @@ Use false true - /Zm250 /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 %(AdditionalOptions) + /Zm250 /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 /w44242 %(AdditionalOptions) $(SolutionDir)..\src\;%(AdditionalIncludeDirectories) Level4 true @@ -176,7 +176,7 @@ Use false true - /Zm250 /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 %(AdditionalOptions) + /Zm250 /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 /w44242 %(AdditionalOptions) $(SolutionDir)..\src\;%(AdditionalIncludeDirectories) Level4 true @@ -193,7 +193,7 @@ Use false true - /Zm250 /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 %(AdditionalOptions) + /Zm250 /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 /w44242 %(AdditionalOptions) $(SolutionDir)..\src\;%(AdditionalIncludeDirectories) Level4 true @@ -211,7 +211,7 @@ Use false true - /Zm250 /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 %(AdditionalOptions) + /Zm250 /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 /w44242 %(AdditionalOptions) _UNICODE;UNICODE;%(PreprocessorDefinitions) $(SolutionDir)..\src\;%(AdditionalIncludeDirectories) Level4 @@ -229,7 +229,7 @@ Use false true - /Zm250 /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 %(AdditionalOptions) + /Zm250 /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 /w44242 %(AdditionalOptions) $(SolutionDir)..\src\;%(AdditionalIncludeDirectories) Level4 true @@ -247,7 +247,7 @@ Use false true - /Zm250 /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 %(AdditionalOptions) + /Zm250 /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 /w44242 %(AdditionalOptions) $(SolutionDir)..\src\;%(AdditionalIncludeDirectories) Level4 true @@ -264,7 +264,7 @@ Use false true - /Zm250 /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 %(AdditionalOptions) + /Zm250 /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 /w44242 %(AdditionalOptions) $(SolutionDir)..\src\;%(AdditionalIncludeDirectories) Level4 true diff --git a/src/CalcViewModel/CalcViewModel.vcxproj b/src/CalcViewModel/CalcViewModel.vcxproj index 3e17838a..a16a37d8 100644 --- a/src/CalcViewModel/CalcViewModel.vcxproj +++ b/src/CalcViewModel/CalcViewModel.vcxproj @@ -154,9 +154,11 @@ $(IntDir)pch.pch $(SolutionDir);%(AdditionalIncludeDirectories) $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) - /bigobj /await %(AdditionalOptions) + /bigobj /await /w44242 %(AdditionalOptions) 28204;4453 stdcpp17 + Level4 + true Console @@ -171,10 +173,12 @@ $(IntDir)pch.pch $(SolutionDir);%(AdditionalIncludeDirectories) $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) - /bigobj /await %(AdditionalOptions) + /bigobj /await /w44242 %(AdditionalOptions) 28204;4453 stdcpp17 Guard + Level4 + true Console @@ -189,9 +193,11 @@ $(IntDir)pch.pch $(SolutionDir);%(AdditionalIncludeDirectories) $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) - /bigobj /await %(AdditionalOptions) + /bigobj /await /w44242 %(AdditionalOptions) 28204;4453 stdcpp17 + Level4 + true Console @@ -206,10 +212,12 @@ $(IntDir)pch.pch $(SolutionDir);%(AdditionalIncludeDirectories) $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) - /bigobj /await %(AdditionalOptions) + /bigobj /await /w44242 %(AdditionalOptions) 28204;4453 stdcpp17 Guard + Level4 + true Console @@ -224,9 +232,11 @@ $(IntDir)pch.pch $(SolutionDir);%(AdditionalIncludeDirectories) $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) - /bigobj /await %(AdditionalOptions) + /bigobj /await /w44242 %(AdditionalOptions) 28204;4453 stdcpp17 + Level4 + true Console @@ -241,10 +251,12 @@ $(IntDir)pch.pch $(SolutionDir);%(AdditionalIncludeDirectories) $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) - /bigobj /await %(AdditionalOptions) + /bigobj /await /w44242 %(AdditionalOptions) 28204;4453 stdcpp17 Guard + Level4 + true Console @@ -259,9 +271,11 @@ $(IntDir)pch.pch $(SolutionDir);%(AdditionalIncludeDirectories) $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) - /bigobj /await %(AdditionalOptions) + /bigobj /await /w44242 %(AdditionalOptions) 28204;4453 stdcpp17 + Level4 + true Console @@ -276,10 +290,12 @@ $(IntDir)pch.pch $(SolutionDir);%(AdditionalIncludeDirectories) $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) - /bigobj /await %(AdditionalOptions) + /bigobj /await /w44242 %(AdditionalOptions) 28204;4453 stdcpp17 Guard + Level4 + true Console diff --git a/src/CalcViewModelCopyForUT/CalcViewModelCopyForUT.vcxproj b/src/CalcViewModelCopyForUT/CalcViewModelCopyForUT.vcxproj index 1abc596f..510e7677 100644 --- a/src/CalcViewModelCopyForUT/CalcViewModelCopyForUT.vcxproj +++ b/src/CalcViewModelCopyForUT/CalcViewModelCopyForUT.vcxproj @@ -133,7 +133,7 @@ true $(SolutionDir)..\src\;$(SolutionDir)CalcViewModel\;%(AdditionalIncludeDirectories) 4453 - /bigobj /await /std:c++17 /utf-8 %(AdditionalOptions) + /bigobj /await /std:c++17 /utf-8 /w44242 %(AdditionalOptions) Level4 true VIEWMODEL_FOR_UT;%(PreprocessorDefinitions) @@ -154,7 +154,7 @@ true $(SolutionDir)..\src\;$(SolutionDir)CalcViewModel\;%(AdditionalIncludeDirectories) 4453 - /bigobj /await /std:c++17 /utf-8 %(AdditionalOptions) + /bigobj /await /std:c++17 /utf-8 /w44242 %(AdditionalOptions) Level4 true VIEWMODEL_FOR_UT;%(PreprocessorDefinitions) @@ -175,7 +175,7 @@ true $(SolutionDir)..\src\;$(SolutionDir)CalcViewModel\;%(AdditionalIncludeDirectories) 4453 - /bigobj /await /std:c++17 /utf-8 %(AdditionalOptions) + /bigobj /await /std:c++17 /utf-8 /w44242 %(AdditionalOptions) Level4 true VIEWMODEL_FOR_UT;%(PreprocessorDefinitions) @@ -196,7 +196,7 @@ true $(SolutionDir)..\src\;$(SolutionDir)CalcViewModel\;%(AdditionalIncludeDirectories) 4453 - /bigobj /await /std:c++17 /utf-8 %(AdditionalOptions) + /bigobj /await /std:c++17 /utf-8 /w44242 %(AdditionalOptions) Level4 true VIEWMODEL_FOR_UT;%(PreprocessorDefinitions) @@ -217,7 +217,7 @@ true $(SolutionDir);$(SolutionDir)CalcViewModel\;%(AdditionalIncludeDirectories) 4453 - /bigobj /await /std:c++17 /utf-8 %(AdditionalOptions) + /bigobj /await /std:c++17 /utf-8 /w44242 %(AdditionalOptions) Level4 true VIEWMODEL_FOR_UT;%(PreprocessorDefinitions) @@ -238,7 +238,7 @@ true $(SolutionDir)..\src\;$(SolutionDir)CalcViewModel\;%(AdditionalIncludeDirectories) 4453 - /bigobj /await /std:c++17 /utf-8 %(AdditionalOptions) + /bigobj /await /std:c++17 /utf-8 /w44242 %(AdditionalOptions) Level4 true VIEWMODEL_FOR_UT;%(PreprocessorDefinitions) @@ -259,7 +259,7 @@ true $(SolutionDir)..\src\;$(SolutionDir)CalcViewModel\;%(AdditionalIncludeDirectories) 4453 - /bigobj /await /std:c++17 /utf-8 %(AdditionalOptions) + /bigobj /await /std:c++17 /utf-8 /w44242 %(AdditionalOptions) Level4 true VIEWMODEL_FOR_UT;%(PreprocessorDefinitions) @@ -280,7 +280,7 @@ true $(SolutionDir)..\src\;$(SolutionDir)CalcViewModel\;%(AdditionalIncludeDirectories) 4453 - /bigobj /await /std:c++17 /utf-8 %(AdditionalOptions) + /bigobj /await /std:c++17 /utf-8 /w44242 %(AdditionalOptions) Level4 true VIEWMODEL_FOR_UT;%(PreprocessorDefinitions) diff --git a/src/CalculatorUnitTests/CalculatorUnitTests.vcxproj b/src/CalculatorUnitTests/CalculatorUnitTests.vcxproj index f90a21a6..a9b5b9b4 100644 --- a/src/CalculatorUnitTests/CalculatorUnitTests.vcxproj +++ b/src/CalculatorUnitTests/CalculatorUnitTests.vcxproj @@ -130,7 +130,7 @@ - /bigobj /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 %(AdditionalOptions) + /bigobj /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 /w44242 %(AdditionalOptions) 4453;28204 $(SolutionDir);$(SolutionDir)CalcManager;$(SolutionDir)CalcViewModel;%(AdditionalIncludeDirectories) Level4 @@ -140,7 +140,7 @@ - /bigobj /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 %(AdditionalOptions) + /bigobj /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 /w44242 %(AdditionalOptions) 4453;28204 $(SolutionDir);$(SolutionDir)CalcManager;$(SolutionDir)CalcViewModel;%(AdditionalIncludeDirectories) Level4 @@ -151,7 +151,7 @@ - /bigobj /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 %(AdditionalOptions) + /bigobj /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 /w44242 %(AdditionalOptions) 4453;28204 $(SolutionDir);$(SolutionDir)CalcManager;$(SolutionDir)CalcViewModel;%(AdditionalIncludeDirectories) Level4 @@ -161,7 +161,7 @@ - /bigobj /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 %(AdditionalOptions) + /bigobj /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 /w44242 %(AdditionalOptions) 4453;28204 $(SolutionDir);$(SolutionDir)CalcManager;$(SolutionDir)CalcViewModel;%(AdditionalIncludeDirectories) Level4 @@ -172,7 +172,7 @@ - /bigobj /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 %(AdditionalOptions) + /bigobj /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 /w44242 %(AdditionalOptions) 4453;28204 $(SolutionDir);$(SolutionDir)CalcManager;$(SolutionDir)CalcViewModel;%(AdditionalIncludeDirectories) Level4 @@ -182,7 +182,7 @@ - /bigobj /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 %(AdditionalOptions) + /bigobj /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 /w44242 %(AdditionalOptions) 4453;28204 $(SolutionDir);$(SolutionDir)CalcManager;$(SolutionDir)CalcViewModel;%(AdditionalIncludeDirectories) Level4 @@ -193,7 +193,7 @@ - /bigobj /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 %(AdditionalOptions) + /bigobj /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 /w44242 %(AdditionalOptions) 4453;28204 $(SolutionDir);$(SolutionDir)CalcManager;$(SolutionDir)CalcViewModel;%(AdditionalIncludeDirectories) Level4 @@ -203,7 +203,7 @@ - /bigobj /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 %(AdditionalOptions) + /bigobj /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 /w44242 %(AdditionalOptions) 4453;28204 $(SolutionDir);$(SolutionDir)CalcManager;$(SolutionDir)CalcViewModel;%(AdditionalIncludeDirectories) Level4 diff --git a/src/GraphControl/Control/Grapher.cpp b/src/GraphControl/Control/Grapher.cpp index 81191a75..20c16fad 100644 --- a/src/GraphControl/Control/Grapher.cpp +++ b/src/GraphControl/Control/Grapher.cpp @@ -80,8 +80,6 @@ namespace GraphControl auto cw = CoreWindow::GetForCurrentThread(); cw->KeyDown += ref new TypedEventHandler(this, &Grapher::OnCoreKeyDown); cw->KeyUp += ref new TypedEventHandler(this, &Grapher::OnCoreKeyUp); - - auto& formatOptions = m_solver->FormatOptions(); } void Grapher::ZoomFromCenter(double scale) @@ -505,7 +503,6 @@ namespace GraphControl if (graphVar->GetVariableName() != s_X && graphVar->GetVariableName() != s_Y) { auto key = ref new String(graphVar->GetVariableName().data()); - double value = 1.0; Variable ^ variable; @@ -602,7 +599,7 @@ namespace GraphControl TryUpdateGraph(false); } - void Grapher::OnUseCommaDecimalSeperatorPropertyChanged(bool oldValue, bool newValue) + void Grapher::OnUseCommaDecimalSeperatorPropertyChanged(bool /*oldValue*/, bool newValue) { if (newValue) { @@ -1063,7 +1060,7 @@ winrt::fire_and_forget Grapher::OnGridLinesColorPropertyChanged(Windows::UI::Col } } -void Grapher::OnLineWidthPropertyChanged(double oldValue, double newValue) +void Grapher::OnLineWidthPropertyChanged(double /*oldValue*/, double /*newValue*/) { if (m_graph) { diff --git a/src/GraphControl/DirectX/DeviceResources.cpp b/src/GraphControl/DirectX/DeviceResources.cpp index f5e6b285..2f4ea7e3 100644 --- a/src/GraphControl/DirectX/DeviceResources.cpp +++ b/src/GraphControl/DirectX/DeviceResources.cpp @@ -169,16 +169,16 @@ namespace GraphControl::DX ComPtr context; HRESULT hr = D3D11CreateDevice( - nullptr, // Specify nullptr to use the default adapter. - D3D_DRIVER_TYPE_HARDWARE, // Create a device using the hardware graphics driver. - 0, // Should be 0 unless the driver is D3D_DRIVER_TYPE_SOFTWARE. - creationFlags, // Set debug and Direct2D compatibility flags. - featureLevels.data(), // List of feature levels this app can support. - featureLevels.size(), // Size of the list above. - D3D11_SDK_VERSION, // Always set this to D3D11_SDK_VERSION for Windows Store apps. - &device, // Returns the Direct3D device created. - &m_d3dFeatureLevel, // Returns feature level of device created. - &context // Returns the device immediate context. + nullptr, // Specify nullptr to use the default adapter. + D3D_DRIVER_TYPE_HARDWARE, // Create a device using the hardware graphics driver. + 0, // Should be 0 unless the driver is D3D_DRIVER_TYPE_SOFTWARE. + creationFlags, // Set debug and Direct2D compatibility flags. + featureLevels.data(), // List of feature levels this app can support. + static_cast(featureLevels.size()), // Size of the list above. + D3D11_SDK_VERSION, // Always set this to D3D11_SDK_VERSION for Windows Store apps. + &device, // Returns the Direct3D device created. + &m_d3dFeatureLevel, // Returns feature level of device created. + &context // Returns the device immediate context. ); if (FAILED(hr)) @@ -193,7 +193,7 @@ namespace GraphControl::DX 0, creationFlags, featureLevels.data(), - featureLevels.size(), + static_cast(featureLevels.size()), D3D11_SDK_VERSION, &device, &m_d3dFeatureLevel, diff --git a/src/GraphControl/DirectX/RenderMain.cpp b/src/GraphControl/DirectX/RenderMain.cpp index fa5ddb77..e553035d 100644 --- a/src/GraphControl/DirectX/RenderMain.cpp +++ b/src/GraphControl/DirectX/RenderMain.cpp @@ -129,8 +129,8 @@ namespace GraphControl::DX if (m_swapChainPanel != nullptr) { // Initialize the active tracing location to just above and to the right of the center of the graph area - m_activeTracingPointerLocation.X = m_swapChainPanel->ActualWidth / 2 + 40; - m_activeTracingPointerLocation.Y = m_swapChainPanel->ActualHeight / 2 - 40; + m_activeTracingPointerLocation.X = static_cast(m_swapChainPanel->ActualWidth / 2 + 40); + m_activeTracingPointerLocation.Y = static_cast(m_swapChainPanel->ActualHeight / 2 - 40); } } diff --git a/src/GraphControl/GraphControl.vcxproj b/src/GraphControl/GraphControl.vcxproj index fd461813..edd95b28 100644 --- a/src/GraphControl/GraphControl.vcxproj +++ b/src/GraphControl/GraphControl.vcxproj @@ -138,10 +138,12 @@ pch.h $(IntDir)pch.pch $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) - /bigobj /await %(AdditionalOptions) + /bigobj /w44242 /await %(AdditionalOptions) 28204 stdcpp17 $(ProjectDir);$(GraphingInterfaceDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + Level4 + true Console @@ -158,11 +160,13 @@ pch.h $(IntDir)pch.pch $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) - /bigobj /await /d2CoroOptsWorkaround %(AdditionalOptions) + /bigobj /w44242 /await /d2CoroOptsWorkaround %(AdditionalOptions) 28204 stdcpp17 $(ProjectDir);$(GraphingInterfaceDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) Guard + Level4 + true Console @@ -179,10 +183,12 @@ pch.h $(IntDir)pch.pch $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) - /bigobj /await %(AdditionalOptions) + /bigobj /w44242 /await %(AdditionalOptions) 28204 stdcpp17 $(ProjectDir);$(GraphingInterfaceDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + Level4 + true Console @@ -199,11 +205,13 @@ pch.h $(IntDir)pch.pch $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) - /bigobj /await /d2CoroOptsWorkaround %(AdditionalOptions) + /bigobj /w44242 /await /d2CoroOptsWorkaround %(AdditionalOptions) 28204 stdcpp17 $(ProjectDir);$(GraphingInterfaceDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) Guard + Level4 + true Console @@ -220,10 +228,12 @@ pch.h $(IntDir)pch.pch $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) - /bigobj /await %(AdditionalOptions) + /bigobj /w44242 /await %(AdditionalOptions) 28204 stdcpp17 $(ProjectDir);$(GraphingInterfaceDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + Level4 + true Console @@ -240,11 +250,13 @@ pch.h $(IntDir)pch.pch $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) - /bigobj /await /d2CoroOptsWorkaround %(AdditionalOptions) + /bigobj /w44242 /await /d2CoroOptsWorkaround %(AdditionalOptions) 28204 stdcpp17 $(ProjectDir);$(GraphingInterfaceDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) Guard + Level4 + true Console @@ -261,10 +273,12 @@ pch.h $(IntDir)pch.pch $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) - /bigobj /await %(AdditionalOptions) + /bigobj /w44242 /await %(AdditionalOptions) 28204 stdcpp17 $(ProjectDir);$(GraphingInterfaceDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + Level4 + true Console @@ -281,11 +295,13 @@ pch.h $(IntDir)pch.pch $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) - /bigobj /await /d2CoroOptsWorkaround %(AdditionalOptions) + /bigobj /w44242 /await /d2CoroOptsWorkaround %(AdditionalOptions) 28204 stdcpp17 $(ProjectDir);$(GraphingInterfaceDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) Guard + Level4 + true Console diff --git a/src/GraphingImpl/GraphingImpl.vcxproj b/src/GraphingImpl/GraphingImpl.vcxproj index 07b750f1..0d99b274 100644 --- a/src/GraphingImpl/GraphingImpl.vcxproj +++ b/src/GraphingImpl/GraphingImpl.vcxproj @@ -132,8 +132,10 @@ Use false stdcpp17 - /DGRAPHING_ENGINE_IMPL %(AdditionalOptions) + /DGRAPHING_ENGINE_IMPL /w44242 %(AdditionalOptions) $(ProjectDir);$(ProjectDir)\..\;$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + Level4 + true Console @@ -146,9 +148,11 @@ Use false stdcpp17 - /DGRAPHING_ENGINE_IMPL %(AdditionalOptions) + /DGRAPHING_ENGINE_IMPL /w44242 %(AdditionalOptions) $(ProjectDir);$(ProjectDir)\..\;$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) Guard + Level4 + true Console @@ -161,8 +165,10 @@ Use false stdcpp17 - /DGRAPHING_ENGINE_IMPL %(AdditionalOptions) + /DGRAPHING_ENGINE_IMPL /w44242 %(AdditionalOptions) $(ProjectDir);$(ProjectDir)\..\;$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + Level4 + true Console @@ -175,9 +181,11 @@ Use false stdcpp17 - /DGRAPHING_ENGINE_IMPL %(AdditionalOptions) + /DGRAPHING_ENGINE_IMPL /w44242 %(AdditionalOptions) $(ProjectDir);$(ProjectDir)\..\;$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) Guard + Level4 + true Console @@ -190,8 +198,10 @@ Use false stdcpp17 - /DGRAPHING_ENGINE_IMPL %(AdditionalOptions) + /DGRAPHING_ENGINE_IMPL /w44242 %(AdditionalOptions) $(ProjectDir);$(ProjectDir)\..\;$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + Level4 + true Console @@ -204,9 +214,11 @@ Use false stdcpp17 - /DGRAPHING_ENGINE_IMPL %(AdditionalOptions) + /DGRAPHING_ENGINE_IMPL /w44242 %(AdditionalOptions) $(ProjectDir);$(ProjectDir)\..\;$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) Guard + Level4 + true Console @@ -219,8 +231,10 @@ Use false stdcpp17 - /DGRAPHING_ENGINE_IMPL %(AdditionalOptions) + /DGRAPHING_ENGINE_IMPL /w44242 %(AdditionalOptions) $(ProjectDir);$(ProjectDir)\..\;$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + Level4 + true Console @@ -233,9 +247,11 @@ Use false stdcpp17 - /DGRAPHING_ENGINE_IMPL %(AdditionalOptions) + /DGRAPHING_ENGINE_IMPL /w44242 %(AdditionalOptions) $(ProjectDir);$(ProjectDir)\..\;$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) Guard + Level4 + true Console diff --git a/src/GraphingImpl/Mocks/Bitmap.h b/src/GraphingImpl/Mocks/Bitmap.h index 7469698d..eaf3973d 100644 --- a/src/GraphingImpl/Mocks/Bitmap.h +++ b/src/GraphingImpl/Mocks/Bitmap.h @@ -9,7 +9,7 @@ namespace MockGraphingImpl { class Bitmap : public Graphing::IBitmap { - virtual const std::vector& GetData() const + virtual const std::vector GetData() const { return std::vector(); } diff --git a/src/GraphingImpl/Mocks/Graph.h b/src/GraphingImpl/Mocks/Graph.h index 8819e940..8624d92d 100644 --- a/src/GraphingImpl/Mocks/Graph.h +++ b/src/GraphingImpl/Mocks/Graph.h @@ -44,7 +44,7 @@ namespace MockGraphingImpl return m_variables; } - virtual void SetArgValue(std::wstring variableName, double value) + virtual void SetArgValue(std::wstring variableName, double /*value*/) { } diff --git a/src/GraphingImpl/Mocks/GraphRenderer.h b/src/GraphingImpl/Mocks/GraphRenderer.h index ac71ad8b..7642bcbd 100644 --- a/src/GraphingImpl/Mocks/GraphRenderer.h +++ b/src/GraphingImpl/Mocks/GraphRenderer.h @@ -22,33 +22,33 @@ namespace MockGraphingImpl { } - virtual HRESULT SetGraphSize(unsigned int width, unsigned int height) + virtual HRESULT SetGraphSize(unsigned int /*width*/, unsigned int /*height*/) { return S_OK; } - virtual HRESULT SetDpi(float dpiX, float dpiY) + virtual HRESULT SetDpi(float /*dpiX*/, float /*dpiY*/) { return S_OK; } - virtual HRESULT DrawD2D1(ID2D1Factory* pDirect2dFactory, ID2D1RenderTarget* pRenderTarget, bool& hasSomeMissingDataOut) + virtual HRESULT DrawD2D1(ID2D1Factory* /*pDirect2dFactory*/, ID2D1RenderTarget* /*pRenderTarget*/, bool& hasSomeMissingDataOut) { hasSomeMissingDataOut = false; return S_OK; } virtual HRESULT GetClosePointData( - double inScreenPointX, - double inScreenPointY, + double /*inScreenPointX*/, + double /*inScreenPointY*/, double precision, int& formulaIdOut, float& xScreenPointOut, float& yScreenPointOut, double& xValueOut, double& yValueOut, - double& rhoValueOut, - double& thetaValueOut, - double& tValueOut) + double& /*rhoValueOut*/, + double& /*thetaValueOut*/, + double& /*tValueOut*/) { formulaIdOut = 0; xScreenPointOut = 0; @@ -68,11 +68,11 @@ namespace MockGraphingImpl return S_OK; } - virtual HRESULT ChangeRange(Graphing::Renderer::ChangeRangeAction action) + virtual HRESULT ChangeRange(Graphing::Renderer::ChangeRangeAction /*action*/) { return S_OK; } - virtual HRESULT MoveRangeByRatio(double ratioX, double ratioY) + virtual HRESULT MoveRangeByRatio(double /*ratioX*/, double /*ratioY*/) { return S_OK; } diff --git a/src/GraphingImpl/Mocks/MathSolver.cpp b/src/GraphingImpl/Mocks/MathSolver.cpp index 41a07084..40bcdc20 100644 --- a/src/GraphingImpl/Mocks/MathSolver.cpp +++ b/src/GraphingImpl/Mocks/MathSolver.cpp @@ -20,7 +20,7 @@ shared_ptr MockGraphingImpl::MathSolver::CreateGrapher() return make_shared(); } -shared_ptr MockGraphingImpl::MathSolver::CreateGrapher(const Graphing::IExpression* expression) +shared_ptr MockGraphingImpl::MathSolver::CreateGrapher(const Graphing::IExpression* /*expression*/) { return make_shared(); } diff --git a/src/GraphingImpl/Mocks/MathSolver.h b/src/GraphingImpl/Mocks/MathSolver.h index e6c18df2..b18dcb00 100644 --- a/src/GraphingImpl/Mocks/MathSolver.h +++ b/src/GraphingImpl/Mocks/MathSolver.h @@ -10,11 +10,11 @@ namespace MockGraphingImpl class ParsingOptions : public Graphing::IParsingOptions { public: - void SetFormatType(Graphing::FormatType type) override + void SetFormatType(Graphing::FormatType /*type*/) override { } - void SetLocalizationType(Graphing::LocalizationType value) override + void SetLocalizationType(Graphing::LocalizationType /*value*/) override { } }; @@ -43,15 +43,15 @@ namespace MockGraphingImpl class FormatOptions : public Graphing::IFormatOptions { public: - void SetFormatType(Graphing::FormatType type) override + void SetFormatType(Graphing::FormatType /*type*/) override { } - void SetMathMLPrefix(const std::wstring& value) override + void SetMathMLPrefix(const std::wstring& /*value*/) override { } - void SetLocalizationType(Graphing::LocalizationType value) override + void SetLocalizationType(Graphing::LocalizationType /*value*/) override { } }; @@ -115,7 +115,7 @@ namespace MockGraphingImpl return m_formatOptions; } - std::unique_ptr ParseInput(const std::wstring& input, int& errorCodeOut, int& errorTypeOut) override + std::unique_ptr ParseInput(const std::wstring& input, int& /*errorCodeOut*/, int& /*errorTypeOut*/) override { if (input.empty()) { @@ -125,7 +125,7 @@ namespace MockGraphingImpl return std::make_unique(MockExpression{}); } - void HRErrorToErrorInfo(HRESULT hr, int& errorCodeOut, int& errorTypeOut) + void HRErrorToErrorInfo(HRESULT /*hr*/, int& /*errorCodeOut*/, int& /*errorTypeOut*/) { } @@ -133,12 +133,12 @@ namespace MockGraphingImpl std::shared_ptr CreateGrapher() override; - std::wstring Serialize(const Graphing::IExpression* expression) override + std::wstring Serialize(const Graphing::IExpression* /*expression*/) override { return L""; } - Graphing::IGraphFunctionAnalysisData IMathSolver::Analyze(const Graphing::Analyzer::IGraphAnalyzer* analyzer) + Graphing::IGraphFunctionAnalysisData IMathSolver::Analyze(const Graphing::Analyzer::IGraphAnalyzer* /*analyzer*/) { return Graphing::IGraphFunctionAnalysisData{}; } diff --git a/src/GraphingInterfaces/IBitmap.h b/src/GraphingInterfaces/IBitmap.h index e59ed4ec..d9285a50 100644 --- a/src/GraphingInterfaces/IBitmap.h +++ b/src/GraphingInterfaces/IBitmap.h @@ -9,6 +9,6 @@ namespace Graphing { struct IBitmap { - virtual const std::vector& GetData() const = 0; + virtual const std::vector GetData() const = 0; }; } diff --git a/src/TraceLogging/TraceLogging.vcxproj b/src/TraceLogging/TraceLogging.vcxproj index d4f936d8..02000ca1 100644 --- a/src/TraceLogging/TraceLogging.vcxproj +++ b/src/TraceLogging/TraceLogging.vcxproj @@ -153,8 +153,10 @@ pch.h $(IntDir)pch.pch $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) - /bigobj /await /std:c++17 /utf-8 %(AdditionalOptions) + /bigobj /await /std:c++17 /utf-8 /w44242 %(AdditionalOptions) 28204 + Level4 + true Console @@ -168,9 +170,11 @@ pch.h $(IntDir)pch.pch $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) - /bigobj /await /std:c++17 /utf-8 %(AdditionalOptions) + /bigobj /await /std:c++17 /utf-8 /w44242 %(AdditionalOptions) 28204 Guard + Level4 + true Console @@ -184,8 +188,10 @@ pch.h $(IntDir)pch.pch $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) - /bigobj /await /std:c++17 /utf-8 %(AdditionalOptions) + /bigobj /await /std:c++17 /utf-8 /w44242 %(AdditionalOptions) 28204 + Level4 + true Console @@ -199,9 +205,11 @@ pch.h $(IntDir)pch.pch $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) - /bigobj /await /std:c++17 /utf-8 %(AdditionalOptions) + /bigobj /await /std:c++17 /utf-8 /w44242 %(AdditionalOptions) 28204 Guard + Level4 + true Console @@ -215,8 +223,10 @@ pch.h $(IntDir)pch.pch $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) - /bigobj /await /std:c++17 /utf-8 %(AdditionalOptions) + /bigobj /await /std:c++17 /utf-8 /w44242 %(AdditionalOptions) 28204 + Level4 + true Console @@ -230,9 +240,11 @@ pch.h $(IntDir)pch.pch $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) - /bigobj /await /std:c++17 /utf-8 %(AdditionalOptions) + /bigobj /await /std:c++17 /utf-8 /w44242 %(AdditionalOptions) 28204 Guard + Level4 + true Console @@ -246,8 +258,10 @@ pch.h $(IntDir)pch.pch $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) - /bigobj /await /std:c++17 /utf-8 %(AdditionalOptions) + /bigobj /await /std:c++17 /utf-8 /w44242 %(AdditionalOptions) 28204 + true + Level4 Console @@ -261,9 +275,11 @@ pch.h $(IntDir)pch.pch $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) - /bigobj /await /std:c++17 /utf-8 %(AdditionalOptions) + /bigobj /await /std:c++17 /utf-8 /w44242 %(AdditionalOptions) 28204 Guard + Level4 + true Console