Skip to content

Commit 13c2eab

Browse files
committed
Fix incorrect usage of #pragma warning
1 parent a18cbdf commit 13c2eab

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+140
-101
lines changed

src/Layers/xrRender/FSkinned.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
#include "stdafx.h"
22
#pragma hdrstop
33

4+
#pragma warning(push)
45
#pragma warning(disable : 4995)
56
#include <d3dx9.h>
6-
#pragma warning(default : 4995)
7+
#pragma warning(pop)
78

89
#include "xrCore/FMesh.hpp"
910
#include "FSkinned.h"

src/Layers/xrRender/FVisual.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
#include "stdafx.h"
22
#pragma hdrstop
33

4+
#pragma warning(push)
45
#pragma warning(disable : 4995)
56
#include <d3dx9.h>
6-
#pragma warning(default : 4995)
7+
#pragma warning(pop)
78

89
#include "xrCore/FMesh.hpp"
910
#include "FVisual.h"

src/Layers/xrRender/HW.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44
#include "stdafx.h"
55
#pragma hdrstop
66

7+
#pragma warning(push)
78
#pragma warning(disable : 4995)
89
#include <d3dx9.h>
9-
#pragma warning(default : 4995)
10+
#pragma warning(pop)
11+
1012
#include "HW.h"
1113
#include "xrEngine/XR_IOConsole.h"
1214

src/Layers/xrRender/ResourceManager.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
#include "stdafx.h"
66
#pragma hdrstop
77

8+
#pragma warning(push)
89
#pragma warning(disable : 4995)
910
#include <d3dx9.h>
10-
#pragma warning(default : 4995)
11+
#pragma warning(pop)
1112

1213
#include "ResourceManager.h"
1314
#include "tss.h"

src/Layers/xrRender/ResourceManager_Resources.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
#include "stdafx.h"
22
#pragma hdrstop
33

4+
#pragma warning(push)
45
#pragma warning(disable : 4995)
56
#include <d3dx9.h>
67
#ifndef _EDITOR
78
#pragma comment(lib, "d3dx9.lib")
89
#include "xrEngine/Render.h"
910
#endif
10-
#pragma warning(default : 4995)
11+
#pragma warning(pop)
1112

1213
#include "ResourceManager.h"
1314
#include "tss.h"

src/Layers/xrRender/SkeletonX.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
#include "stdafx.h"
66
#pragma hdrstop
77

8+
#pragma warning(push)
89
#pragma warning(disable : 4995)
910
#include <d3dx9.h>
10-
#pragma warning(default : 4995)
11+
#pragma warning(pop)
1112

1213
#ifndef _EDITOR
1314
#include "xrEngine/Render.h"

src/Layers/xrRender/Texture.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
#include "stdafx.h"
66
#pragma hdrstop
77

8+
#pragma warning(push)
89
#pragma warning(disable : 4995)
910
#include <d3dx9.h>
10-
#pragma warning(default : 4995)
11+
#pragma warning(pop)
1112

1213
void fix_texture_name(LPSTR fn)
1314
{

src/Layers/xrRender/r_constants.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
#include "stdafx.h"
22
#pragma hdrstop
33

4+
#pragma warning(push)
45
#pragma warning(disable : 4995)
56
#include <d3dx9.h>
6-
#pragma warning(default : 4995)
7+
#pragma warning(pop)
78

89
#include "ResourceManager.h"
910
#include "xrCore/xrPool.h"

src/Layers/xrRenderDX10/dx10HW.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44
#include "stdafx.h"
55
#pragma hdrstop
66

7+
#pragma warning(push)
78
#pragma warning(disable : 4995)
89
#include <d3dx9.h>
9-
#pragma warning(default : 4995)
10+
#pragma warning(pop)
11+
1012
#include "Layers/xrRender/HW.h"
1113
#include "xrEngine/XR_IOConsole.h"
1214
#include "Include/xrAPI/xrAPI.h"

src/Layers/xrRenderDX10/dx10ResourceManager_Resources.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
#include "stdafx.h"
22
#pragma hdrstop
33

4+
#pragma warning(push)
45
#pragma warning(disable : 4995)
56
#include <d3dx9.h>
67
#ifndef _EDITOR
78
#pragma comment(lib, "d3dx9.lib")
89
#include "xrEngine/Render.h"
910
#endif
10-
#pragma warning(default : 4995)
11+
#pragma warning(pop)
1112

1213
#include <D3DX10Core.h>
1314

0 commit comments

Comments
 (0)