Fix incorrect usage of #pragma warning

OpenXRay · Apr 10, 2017 · 13c2eab · 13c2eab
1 parent a18cbdf
commit 13c2eab
Show file tree

Hide file tree

Showing 63 changed files with 140 additions and 101 deletions.
diff --git a/src/Layers/xrRender/FSkinned.cpp b/src/Layers/xrRender/FSkinned.cpp
@@ -1,9 +1,10 @@
 #include "stdafx.h"
 #pragma hdrstop
 
+#pragma warning(push)
 #pragma warning(disable : 4995)
 #include <d3dx9.h>
-#pragma warning(default : 4995)
+#pragma warning(pop)
 
 #include "xrCore/FMesh.hpp"
 #include "FSkinned.h"

diff --git a/src/Layers/xrRender/FVisual.cpp b/src/Layers/xrRender/FVisual.cpp
@@ -1,9 +1,10 @@
 #include "stdafx.h"
 #pragma hdrstop
 
+#pragma warning(push)
 #pragma warning(disable : 4995)
 #include <d3dx9.h>
-#pragma warning(default : 4995)
+#pragma warning(pop)
 
 #include "xrCore/FMesh.hpp"
 #include "FVisual.h"

diff --git a/src/Layers/xrRender/HW.cpp b/src/Layers/xrRender/HW.cpp
@@ -4,9 +4,11 @@
 #include "stdafx.h"
 #pragma hdrstop
 
+#pragma warning(push)
 #pragma warning(disable : 4995)
 #include <d3dx9.h>
-#pragma warning(default : 4995)
+#pragma warning(pop)
+
 #include "HW.h"
 #include "xrEngine/XR_IOConsole.h"
 

diff --git a/src/Layers/xrRender/ResourceManager.cpp b/src/Layers/xrRender/ResourceManager.cpp
@@ -5,9 +5,10 @@
 #include "stdafx.h"
 #pragma hdrstop
 
+#pragma warning(push)
 #pragma warning(disable : 4995)
 #include <d3dx9.h>
-#pragma warning(default : 4995)
+#pragma warning(pop)
 
 #include "ResourceManager.h"
 #include "tss.h"

diff --git a/src/Layers/xrRender/ResourceManager_Resources.cpp b/src/Layers/xrRender/ResourceManager_Resources.cpp
@@ -1,13 +1,14 @@
 #include "stdafx.h"
 #pragma hdrstop
 
+#pragma warning(push)
 #pragma warning(disable : 4995)
 #include <d3dx9.h>
 #ifndef _EDITOR
 #pragma comment(lib, "d3dx9.lib")
 #include "xrEngine/Render.h"
 #endif
-#pragma warning(default : 4995)
+#pragma warning(pop)
 
 #include "ResourceManager.h"
 #include "tss.h"

diff --git a/src/Layers/xrRender/SkeletonX.cpp b/src/Layers/xrRender/SkeletonX.cpp
@@ -5,9 +5,10 @@
 #include "stdafx.h"
 #pragma hdrstop
 
+#pragma warning(push)
 #pragma warning(disable : 4995)
 #include <d3dx9.h>
-#pragma warning(default : 4995)
+#pragma warning(pop)
 
 #ifndef _EDITOR
 #include "xrEngine/Render.h"

diff --git a/src/Layers/xrRender/Texture.cpp b/src/Layers/xrRender/Texture.cpp
@@ -5,9 +5,10 @@
 #include "stdafx.h"
 #pragma hdrstop
 
+#pragma warning(push)
 #pragma warning(disable : 4995)
 #include <d3dx9.h>
-#pragma warning(default : 4995)
+#pragma warning(pop)
 
 void fix_texture_name(LPSTR fn)
 {

diff --git a/src/Layers/xrRender/r_constants.cpp b/src/Layers/xrRender/r_constants.cpp
@@ -1,9 +1,10 @@
 #include "stdafx.h"
 #pragma hdrstop
 
+#pragma warning(push)
 #pragma warning(disable : 4995)
 #include <d3dx9.h>
-#pragma warning(default : 4995)
+#pragma warning(pop)
 
 #include "ResourceManager.h"
 #include "xrCore/xrPool.h"

diff --git a/src/Layers/xrRenderDX10/dx10HW.cpp b/src/Layers/xrRenderDX10/dx10HW.cpp
@@ -4,9 +4,11 @@
 #include "stdafx.h"
 #pragma hdrstop
 
+#pragma warning(push)
 #pragma warning(disable : 4995)
 #include <d3dx9.h>
-#pragma warning(default : 4995)
+#pragma warning(pop)
+
 #include "Layers/xrRender/HW.h"
 #include "xrEngine/XR_IOConsole.h"
 #include "Include/xrAPI/xrAPI.h"

diff --git a/src/Layers/xrRenderDX10/dx10ResourceManager_Resources.cpp b/src/Layers/xrRenderDX10/dx10ResourceManager_Resources.cpp
@@ -1,13 +1,14 @@
 #include "stdafx.h"
 #pragma hdrstop
 
+#pragma warning(push)
 #pragma warning(disable : 4995)
 #include <d3dx9.h>
 #ifndef _EDITOR
 #pragma comment(lib, "d3dx9.lib")
 #include "xrEngine/Render.h"
 #endif
-#pragma warning(default : 4995)
+#pragma warning(pop)
 
 #include <D3DX10Core.h>
 

diff --git a/src/Layers/xrRenderDX10/dx10Texture.cpp b/src/Layers/xrRenderDX10/dx10Texture.cpp
@@ -1,9 +1,10 @@
 #include "stdafx.h"
 #pragma hdrstop
 
+#pragma warning(push)
 #pragma warning(disable : 4995)
 #include <d3dx9.h>
-#pragma warning(default : 4995)
+#pragma warning(pop)
 
 #include <D3DX10Tex.h>
 

diff --git a/src/Layers/xrRenderDX10/dx10r_constants.cpp b/src/Layers/xrRenderDX10/dx10r_constants.cpp
@@ -1,9 +1,10 @@
 #include "stdafx.h"
 #pragma hdrstop
 
+#pragma warning(push)
 #pragma warning(disable : 4995)
 #include <d3dx9.h>
-#pragma warning(default : 4995)
+#pragma warning(pop)
 
 #include "Layers/xrRender/ResourceManager.h"
 #include "xrCore/xrPool.h"

diff --git a/src/Layers/xrRenderPC_R1/stdafx.h b/src/Layers/xrRenderPC_R1/stdafx.h
@@ -4,12 +4,13 @@
 #define D3D_DEBUG_INFO
 #endif
 
+#pragma warning(push)
 #pragma warning(disable : 4995)
 #include "xrEngine/stdafx.h"
-#pragma warning(disable : 4995)
 #include <d3d9.h>
 #include <d3dx9.h>
-#pragma warning(default : 4995)
+#pragma warning(pop)
+
 #pragma warning(disable : 4714)
 #pragma warning(4 : 4018)
 #pragma warning(4 : 4244)

diff --git a/src/Layers/xrRenderPC_R2/stdafx.h b/src/Layers/xrRenderPC_R2/stdafx.h
@@ -8,12 +8,14 @@
 #define D3D_DEBUG_INFO
 #endif
 
+#pragma warning(push)
 #pragma warning(disable : 4995)
 #include "xrEngine/stdafx.h"
 #pragma warning(disable : 4995)
 #include <d3d9.h>
 #include <d3dx9.h>
-#pragma warning(default : 4995)
+#pragma warning(pop)
+
 #pragma warning(disable : 4714)
 #pragma warning(4 : 4018)
 #pragma warning(4 : 4244)

diff --git a/src/Layers/xrRenderPC_R3/stdafx.h b/src/Layers/xrRenderPC_R3/stdafx.h
@@ -8,12 +8,13 @@
 #define D3D_DEBUG_INFO
 #endif
 
+#pragma warning(push)
 #pragma warning(disable : 4995)
 #include "xrEngine/stdafx.h"
-#pragma warning(disable : 4995)
 #include <d3d9.h>
 #include <d3dx9.h>
-#pragma warning(default : 4995)
+#pragma warning(pop)
+
 #pragma warning(disable : 4714)
 #pragma warning(4 : 4018)
 #pragma warning(4 : 4244)

diff --git a/src/Layers/xrRenderPC_R4/stdafx.h b/src/Layers/xrRenderPC_R4/stdafx.h
@@ -8,11 +8,12 @@
 #define D3D_DEBUG_INFO
 #endif
 
+#pragma warning(push)
 #pragma warning(disable : 4995)
 #include "xrEngine/stdafx.h"
-#pragma warning(disable : 4995)
 #include <d3dx9.h>
-#pragma warning(default : 4995)
+#pragma warning(pop)
+
 #pragma warning(disable : 4714)
 #pragma warning(4 : 4018)
 #pragma warning(4 : 4244)

diff --git a/src/editors/ECore/Engine/NVMeshMender.h b/src/editors/ECore/Engine/NVMeshMender.h
@@ -123,10 +123,10 @@ generated on my behalf
 
 
 ******************************************************************************/
-
+#pragma warning(push)
 #pragma warning(disable : 4995)
 #include <string>
-#pragma warning(default : 4995)
+#pragma warning(pop)
 
 class NVMeshMender
 {

diff --git a/src/plugins/Max/Export/Stdafx.h b/src/plugins/Max/Export/Stdafx.h
@@ -1,13 +1,13 @@
 //----------------------------------------------------
 // file: stdafx.h
 //----------------------------------------------------
+#pragma once
 #ifndef __INCDEF_STDAFX_H_
 #define __INCDEF_STDAFX_H_
 
-#pragma once
-
 #define _WIN32_WINNT 0x0500
 
+#pragma warning(push)
 #pragma warning(disable : 4995)
 #include "Max.h"
 
@@ -107,6 +107,6 @@ DEFINE_VECTOR(AnsiString, AStringVec, AStringIt);
 #define GAMEMTL_NONE u32(-1)
 #define _game_data_ "$game_data$"
 
-#pragma warning(default : 4995)
+#pragma warning(pop)
 
 #endif /*_INCDEF_STDAFX_H_*/
diff --git a/src/plugins/Max/Material/Stdafx.h b/src/plugins/Max/Material/Stdafx.h
@@ -1,13 +1,13 @@
 //----------------------------------------------------
 // file: stdafx.h
 //----------------------------------------------------
+#pragma once
 #ifndef __INCDEF_STDAFX_H_
 #define __INCDEF_STDAFX_H_
 
-#pragma once
-
 #define _WIN32_WINNT 0x0500
 
+#pragma warning(push)
 #pragma warning(disable : 4995)
 #include "Max.h"
 
@@ -106,6 +106,6 @@ DEFINE_VECTOR(AnsiString, AStringVec, AStringIt);
 #define GAMEMTL_NONE u32(-1)
 #define _game_data_ "$game_data$"
 
-#pragma warning(default : 4995)
+#pragma warning(pop)
 
 #endif /*_INCDEF_STDAFX_H_*/
diff --git a/src/plugins/lw/Export/scenscan/objectdb.cpp b/src/plugins/lw/Export/scenscan/objectdb.cpp
@@ -9,6 +9,7 @@ Functions for creating an object database.
 #include "objectdb.h"
 #include "vecmat.h"
 
+#pragma warning(push)
 #pragma warning(disable : 4995)
 
 /*
@@ -486,4 +487,4 @@ int printObjectDB(ObjectDB* odb, FILE* fp, int c)
     return 1;
 }
 
-#pragma warning(default : 4995)
+#pragma warning(pop)
diff --git a/src/plugins/lw/Export/scenscan/ptsearch.cpp b/src/plugins/lw/Export/scenscan/ptsearch.cpp
@@ -26,6 +26,7 @@ of points.
 #define COORD(p, c) odb->pt[odb->vsort[p]].pos[ipos][c]
 #define SORTVAL(p) COORD(p, key)
 
+#pragma warning(push)
 #pragma warning(disable : 4995)
 
 /*
@@ -231,4 +232,4 @@ int pointSearch(ObjectDB* odb, float pos[3])
     return -1;
 }
 
-#pragma warning(default : 4995)
+#pragma warning(pop)
diff --git a/src/plugins/lw/Export/scenscan/surface.cpp b/src/plugins/lw/Export/scenscan/surface.cpp
@@ -9,6 +9,7 @@ surface.c
 #include "objectdb.h"
 #include <lwhost.h>
 
+#pragma warning(push)
 #pragma warning(disable : 4995)
 
 extern "C" LWMessageFuncs* g_msg;
@@ -231,4 +232,4 @@ int getObjectSurfs(ObjectDB* odb, LWMeshInfo* mesh, GlobalFunc* global)
     return 1;
 }
 
-#pragma warning(default : 4995)
+#pragma warning(pop)
diff --git a/src/plugins/lw/Export/scenscan/vecmat.cpp b/src/plugins/lw/Export/scenscan/vecmat.cpp
@@ -7,6 +7,7 @@ Basic vector and matrix functions.
 ====================================================================== */
 #include "vecmat.h"
 
+#pragma warning(push)
 #pragma warning(disable : 4995)
 
 float dot(LWFVector a, LWFVector b) { return a[0] * b[0] + a[1] * b[1] + a[2] * b[2]; }
@@ -30,4 +31,4 @@ void normalize(LWFVector v)
     }
 }
 
-#pragma warning(default : 4995)
+#pragma warning(pop)
diff --git a/src/plugins/lw/Export/scenscan/vmap.cpp b/src/plugins/lw/Export/scenscan/vmap.cpp
@@ -8,6 +8,7 @@ vmap.c
 #include "scenscan.h"
 #include "objectdb.h"
 
+#pragma warning(push)
 #pragma warning(disable : 4995)
 
 /*
@@ -440,4 +441,4 @@ int getObjectVMaps(ObjectDB* odb, LWMeshInfo* mesh, GlobalFunc* global)
     return ok;
 }
 
-#pragma warning(default : 4995)
+#pragma warning(pop)
diff --git a/src/plugins/lw/Shader/blotch.c b/src/plugins/lw/Shader/blotch.c
@@ -24,6 +24,7 @@ data, and it should be resolved in later builds.
 #include <math.h>
 #include "LW_Shader.h"
 
+#pragma warning(push)
 #pragma warning(disable : 4996)
 
 #ifndef PI
@@ -478,4 +479,4 @@ Interface(long version, GlobalFunc* global, LWInterface* local, void* serverData
 ServerRecord ServerDesc[] = {
 {LWSHADER_HCLASS, SH_PLUGIN_NAME, Handler}, {LWSHADER_ICLASS, SH_PLUGIN_NAME, Interface}, {NULL}};
 
-#pragma warning(default : 4996)
+#pragma warning(pop)
diff --git a/src/utils/CompressionTest/CompressionTest.cpp b/src/utils/CompressionTest/CompressionTest.cpp
@@ -4,10 +4,11 @@
 #include "xrCore/PPMd.h"
 #include "xrCore/compression_ppmd_stream.h"
 
+#pragma warning(push)
 #pragma warning(disable : 193 128 810)
 #include "utils/xrCompress/lzo/lzo1x.h"
 #include "utils/xrCompress/lzo/lzo1y.h"
-#pragma warning(default : 193 128 810)
+#pragma warning(pop)
 
 extern compression::ppmd::stream* trained_model;
 

diff --git a/src/utils/LWO/lwo2.c b/src/utils/LWO/lwo2.c
@@ -11,6 +11,7 @@ Ernie Wright  17 Sep 00
 #include <stdlib.h>
 #include "lwo2.h"
 
+#pragma warning(push)
 #pragma warning(disable : 4996)
 
 /*
@@ -299,4 +300,4 @@ lwObject* lwGetObject(char* filename, unsigned int* failID, int* failpos)
     return NULL;
 }
 
-#pragma warning(default : 4996)
+#pragma warning(pop)