diff --git a/Inc/DirectXMath.h b/Inc/DirectXMath.h index d9b9665..053f4f4 100644 --- a/Inc/DirectXMath.h +++ b/Inc/DirectXMath.h @@ -617,6 +617,15 @@ namespace DirectX // Fix-up for (2nd+) XMMATRIX parameters to pass by reference typedef const XMMATRIX& CXMMATRIX; +#ifdef __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wgnu-anonymous-struct" +#pragma clang diagnostic ignored "-Wnested-anon-types" +#elif defined(__GNUC__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpedantic" +#endif + #ifdef _XM_NO_INTRINSICS_ struct XMMATRIX #else @@ -713,6 +722,12 @@ namespace DirectX friend XMMATRIX XM_CALLCONV operator*(float S, FXMMATRIX M) noexcept; }; +#ifdef __clang__ +#pragma clang diagnostic pop +#elif defined(__GNUC__) +#pragma GCC diagnostic pop +#endif + //------------------------------------------------------------------------------ // 2D Vector; 32 bit floating point components struct XMFLOAT2 @@ -1031,6 +1046,9 @@ namespace DirectX #pragma clang diagnostic ignored "-Wnested-anon-types" #pragma clang diagnostic ignored "-Wunknown-warning-option" #pragma clang diagnostic ignored "-Wunsafe-buffer-usage" +#elif defined(__GNUC__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpedantic" #endif //------------------------------------------------------------------------------ @@ -1412,6 +1430,8 @@ namespace DirectX #ifdef __clang__ #pragma clang diagnostic pop +#elif defined(__GNUC__) +#pragma GCC diagnostic pop #endif #ifdef _PREFAST_ #pragma prefast(pop) diff --git a/Inc/DirectXMathMatrix.inl b/Inc/DirectXMathMatrix.inl index d0f8e11..4148497 100644 --- a/Inc/DirectXMathMatrix.inl +++ b/Inc/DirectXMathMatrix.inl @@ -1137,6 +1137,8 @@ _Use_decl_annotations_ inline bool fAbsZ = fabsf(XMVectorGetZ(ppvBasis[a][0])); XM3RANKDECOMPOSE(aa, bb, cc, fAbsX, fAbsY, fAbsZ) + (void)aa; + (void)bb; ppvBasis[b][0] = XMVector3Cross(ppvBasis[a][0], pvCanonicalBasis[cc][0]); } diff --git a/Inc/DirectXPackedVector.h b/Inc/DirectXPackedVector.h index c849bf7..764bd49 100644 --- a/Inc/DirectXPackedVector.h +++ b/Inc/DirectXPackedVector.h @@ -29,6 +29,9 @@ namespace DirectX #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wgnu-anonymous-struct" #pragma clang diagnostic ignored "-Wnested-anon-types" +#elif defined(__GNUC__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpedantic" #endif //------------------------------------------------------------------------------ @@ -1400,6 +1403,8 @@ namespace DirectX #ifdef __clang__ #pragma clang diagnostic pop +#elif defined(__GNUC__) +#pragma GCC diagnostic pop #endif #ifdef _MSC_VER #pragma warning(pop)