From 897085110f00df5f2498a3a556d2e5ccb422de28 Mon Sep 17 00:00:00 2001 From: Andrew Richards Date: Fri, 10 Jan 2025 15:28:02 +0000 Subject: [PATCH] D3D12: Fix some pragma warnings for push and pop. --- DirectX12/Buffer.h | 5 +++-- DirectX12/PlatformStructuredBuffer.h | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/DirectX12/Buffer.h b/DirectX12/Buffer.h index eed3fd62..a03b9654 100644 --- a/DirectX12/Buffer.h +++ b/DirectX12/Buffer.h @@ -3,7 +3,7 @@ #include "Platform/DirectX12/Export.h" #include "Platform/CrossPlatform/Buffer.h" - +#pragma warning(push) #pragma warning(disable:4251) namespace platform @@ -11,7 +11,7 @@ namespace platform namespace dx12 { /// DirectX12 buffer class that can be used as index buffer and vertex buffer - class SIMUL_DIRECTX12_EXPORT Buffer:public platform::crossplatform::Buffer + class SIMUL_DIRECTX12_EXPORT Buffer : public platform::crossplatform::Buffer { public: Buffer(); @@ -47,3 +47,4 @@ namespace platform } }; +#pragma warning(pop) diff --git a/DirectX12/PlatformStructuredBuffer.h b/DirectX12/PlatformStructuredBuffer.h index dd86c3d3..c53f3625 100644 --- a/DirectX12/PlatformStructuredBuffer.h +++ b/DirectX12/PlatformStructuredBuffer.h @@ -5,6 +5,7 @@ #include "SimulDirectXHeader.h" #include "Heap.h" +#pragma warning(push) #pragma warning(disable:4251) namespace platform @@ -14,6 +15,7 @@ namespace platform class EffectPass; class Effect; class RenderPlatform; + //! DirectX12 structured buffer class class PlatformStructuredBuffer:public crossplatform::PlatformStructuredBuffer { @@ -88,3 +90,5 @@ namespace platform }; } } + +#pragma warning(pop)