Commit ba73d3d5 authored by Chuck Walbourn's avatar Chuck Walbourn
Browse files

Fix VS 2017 (15.7) warnings and build breaks

parent 63c67b00

Kits/DirectXTK/Src/pch.h

+5 −11
Original line number Diff line number Diff line
@@ -9,17 +9,9 @@ 


#pragma once



// VS 2013 related Off by default warnings

#pragma warning(disable : 4619 4616 4350 4351 4472 4640 5038)

// C4619/4616 #pragma warning warnings

// C4350 behavior change

// C4351 behavior change; warning removed in later versions

// C4472 'X' is a native enum: add an access specifier (private/public) to declare a WinRT enum

// C4640 construction of local static object is not thread-safe

// C5038 can't use strictly correct initialization order due to Dev12 initialization limitations



// Off by default warnings

#pragma warning(disable : 4061 4265 4365 4571 4623 4625 4626 4628 4668 4710 4711 4746 4774 4820 4987 5026 5027 5031 5032 5039)

#pragma warning(disable : 4619 4616 4061 4265 4365 4571 4623 4625 4626 4628 4668 4710 4711 4746 4774 4820 4987 5026 5027 5031 5032 5038 5039 5045)

// C4619/4616 #pragma warning warnings

// C4061 enumerator 'X' in switch of enum 'X' is not explicitly handled by a case label

// C4265 class has virtual functions, but destructor is not virtual

// C4365 signed/unsigned mismatch
@@ -38,7 +30,9 @@ 
// C5026 move constructor was implicitly defined as deleted

// C5027 move assignment operator was implicitly defined as deleted

// C5031/5032 push/pop mismatches in windows headers

// C5038 initialization order

// C5039 pointer or reference to potentially throwing function passed to extern C function under - EHc

// C5045 Spectre mitigation warning



// XBox One XDK related Off by default warnings

#pragma warning(disable : 5043)
@@ -109,7 +103,7 @@ 
#include <stdint.h>



#pragma warning(push)

#pragma warning(disable : 4467)

#pragma warning(disable : 4467 5038)

#include <wrl.h>

#pragma warning(pop)

Kits/DirectXTK12/Src/pch.h

+2 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#pragma once



// Off by default warnings

#pragma warning(disable : 4619 4061 4265 4355 4365 4571 4623 4625 4626 4628 4668 4710 4711 4746 4774 4820 4987 5026 5027 5031 5032 5039)

#pragma warning(disable : 4619 4061 4265 4355 4365 4571 4623 4625 4626 4628 4668 4710 4711 4746 4774 4820 4987 5026 5027 5031 5032 5039 5045)

// C4619 #pragma warning: there is no warning number 'X'

// C4061 enumerator 'X' in switch of enum 'X' is not explicitly handled by a case label

// C4265 class has virtual functions, but destructor is not virtual
@@ -32,6 +32,7 @@ 
// C5027 move assignment operator was implicitly defined as deleted

// C5031/5032 push/pop mismatches in windows headers

// C5039 pointer or reference to potentially throwing function passed to extern C function under - EHc

// C5045 Spectre mitigation warning



// XBox One XDK related Off by default warnings

#pragma warning(disable : 4471 4917 4986 5043)

Kits/DirectXTex/DirectXTexp.h

+3 −9
Original line number Diff line number Diff line
@@ -11,16 +11,9 @@ 


#pragma once



// VS 2013 related Off by default warnings

#pragma warning(disable : 4619 4616 4350 4351 4472 4640)

// C4619/4616 #pragma warning warnings

// C4350 behavior change

// C4351 behavior change; warning removed in later versions

// C4472 'X' is a native enum: add an access specifier (private/public) to declare a WinRT enum

// C4640 construction of local static object is not thread-safe



// Off by default warnings

#pragma warning(disable : 4061 4265 4365 4571 4623 4625 4626 4628 4668 4710 4711 4746 4774 4820 4987 5026 5027 5031 5032 5039)

#pragma warning(disable : 4619 4616 4061 4265 4365 4571 4623 4625 4626 4628 4668 4710 4711 4746 4774 4820 4987 5026 5027 5031 5032 5039 5045)

// C4619/4616 #pragma warning warnings

// C4061 enumerator 'X' in switch of enum 'X' is not explicitly handled by a case label

// C4265 class has virtual functions, but destructor is not virtual

// C4365 signed/unsigned mismatch
@@ -40,6 +33,7 @@ 
// C5027 move assignment operator was implicitly defined as deleted

// C5031/5032 push/pop mismatches in windows headers

// C5039 pointer or reference to potentially throwing function passed to extern C function under - EHc

// C5045 Spectre mitigation warning



// Windows 8.1 SDK related Off by default warnings

#pragma warning(disable : 4471 4917 4986 5029)

UWPSamples/IntroGraphics/SimpleTriangleCppWinRT_UWP/Main.cpp

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ protected: 
    {

        auto deferral = args.SuspendingOperation().GetDeferral();



        std::async(std::launch::async, [this, deferral]()

        auto f = std::async(std::launch::async, [this, deferral]()

        {

            m_sample->OnSuspending();

UWPSamples/IntroGraphics/SimpleTriangleCppWinRT_UWP12/Main.cpp

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ protected: 
    {

        auto deferral = args.SuspendingOperation().GetDeferral();



        std::async(std::launch::async, [this, deferral]()

        auto f = std::async(std::launch::async, [this, deferral]()

        {

            m_sample->OnSuspending();