Skip to content

Commit 033c653

Browse files
committed
Suppress false 26495 warnings
1 parent 15c0596 commit 033c653

File tree

4 files changed

+11
-1
lines changed

4 files changed

+11
-1
lines changed

Inc/DirectXCollision.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ struct BoundingFrustum
265265
: Origin(_Origin), Orientation(_Orientation),
266266
RightSlope(_RightSlope), LeftSlope(_LeftSlope), TopSlope(_TopSlope), BottomSlope(_BottomSlope),
267267
Near(_Near), Far(_Far) {}
268-
BoundingFrustum( _In_ CXMMATRIX Projection ) { CreateFromMatrix( *this, Projection ); }
268+
BoundingFrustum( _In_ CXMMATRIX Projection );
269269

270270
// Methods
271271
void XM_CALLCONV Transform( _Out_ BoundingFrustum& Out, _In_ FXMMATRIX M ) const;
@@ -345,6 +345,7 @@ namespace TriangleTests
345345
#ifdef _PREFAST_
346346
#pragma prefast(push)
347347
#pragma prefast(disable : 25000, "FXMVECTOR is 16 bytes")
348+
#pragma prefast(disable : 26495, "Union initialization confuses /analyze")
348349
#endif
349350

350351
#include "DirectXCollision.inl"

Inc/DirectXCollision.inl

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2803,6 +2803,13 @@ inline void BoundingOrientedBox::CreateFromPoints( BoundingOrientedBox& Out, siz
28032803
*
28042804
****************************************************************************/
28052805

2806+
_Use_decl_annotations_
2807+
inline BoundingFrustum::BoundingFrustum( CXMMATRIX Projection )
2808+
{
2809+
CreateFromMatrix(*this, Projection);
2810+
}
2811+
2812+
28062813
//-----------------------------------------------------------------------------
28072814
// Transform a frustum by an angle preserving transform.
28082815
//-----------------------------------------------------------------------------

Inc/DirectXMath.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2017,6 +2017,7 @@ XMGLOBALCONST XMVECTORF32 g_UShortMax = { { { 65535.0f, 65535.0f,
20172017
#ifdef _PREFAST_
20182018
#pragma prefast(push)
20192019
#pragma prefast(disable : 25000, "FXMVECTOR is 16 bytes")
2020+
#pragma prefast(disable : 26495, "Union initialization confuses /analyze")
20202021
#endif
20212022

20222023
//------------------------------------------------------------------------------

Inc/DirectXPackedVector.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1229,6 +1229,7 @@ void XM_DEPRECATED XM_CALLCONV XMStoreXDec4(_Out_ XMXDEC4* pDestination, _In_
12291229
#ifdef _PREFAST_
12301230
#pragma prefast(push)
12311231
#pragma prefast(disable : 25000, "FXMVECTOR is 16 bytes")
1232+
#pragma prefast(disable : 26495, "Union initialization confuses /analyze")
12321233
#endif
12331234

12341235
#include "DirectXPackedVector.inl"

0 commit comments

Comments
 (0)