Misc header fixes.

tamlin-mike · Xottab-DUTY · commit 8dc6fdb86429 · 2017-08-05T11:41:04.000+05:00
Add #pragma once, make headers more self-contained, a few ISO/POSIX
fixes (adding leading underscore to function names).
diff --git a/src/Common/inlining_macros.h b/src/Common/inlining_macros.h
@@ -1,6 +1,4 @@
-#ifdef _MSC_VER
 #pragma once
-#endif
 #ifndef INLINING_MACROS_H
 #define INLINING_MACROS_H
 
diff --git a/src/Common/xr_impexp_macros.h b/src/Common/xr_impexp_macros.h
@@ -1,6 +1,4 @@
-#ifdef _MSC_VER
 #pragma once
-#endif
 #ifndef XR_IMPEXP_MACROS_H
 #define XR_IMPEXP_MACROS_H
 
diff --git a/src/Layers/xrRender/VertexCache.h b/src/Layers/xrRender/VertexCache.h
@@ -1,5 +1,9 @@
+#pragma once
 #ifndef VERTEX_CACHE_H
 #define VERTEX_CACHE_H
+#include"Common/inlining_macros.h"
+#include"xrCore/_types.h"
+#include"xrCore/_stl_extensions.h"
 
 class VertexCache
 {
diff --git a/src/utils/Shader_xrLC.h b/src/utils/Shader_xrLC.h
@@ -91,15 +91,15 @@ class Shader_xrLC_LIB
     u32 GetID(LPCSTR name) const
     {
         for (auto it = library.begin(); it != library.end(); it++)
-            if (0 == stricmp(name, it->Name))
+            if (0 == _stricmp(name, it->Name))
                 return u32(it - library.begin());
         return u32(-1);
     }
 
     Shader_xrLC* Get(LPCSTR name)
     {
         for (auto& shader : library)
-            if (0 == stricmp(name, shader.Name))
+            if (0 == _stricmp(name, shader.Name))
                 return &shader;
         return nullptr;
     }
@@ -117,7 +117,7 @@ class Shader_xrLC_LIB
     void Remove(LPCSTR name)
     {
         for (auto it = library.begin(); it != library.end(); it++)
-            if (0 == stricmp(name, it->Name))
+            if (0 == _stricmp(name, it->Name))
             {
                 library.erase(it);
                 break;
diff --git a/src/xrCore/FS.h b/src/xrCore/FS.h
@@ -1,9 +1,11 @@
+#pragma once
 // FS.h: interface for the CFS class.
 //
 //////////////////////////////////////////////////////////////////////
 
 #ifndef fsH
 #define fsH
+#include "_stl_extensions.h"
 
 #define CFS_CompressMark (1ul << 31ul)
 #define CFS_HeaderChunkID (666)
diff --git a/src/xrCore/FTimer.h b/src/xrCore/FTimer.h
@@ -1,6 +1,10 @@
 #pragma once
 #ifndef FTimerH
 #define FTimerH
+#include "xrCore_impexp.h"
+#include "_stl_extensions.h"
+#include "_math.h"
+#include "log.h"
 
 class CTimer_paused;
 
diff --git a/src/xrCore/Threading/Lock.hpp b/src/xrCore/Threading/Lock.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "xrCore/xrCore.h"
+#include "xrCore/xrCore_impexp.h"
 
 #include <mutex>
 #include <atomic>
diff --git a/src/xrCore/_color.h b/src/xrCore/_color.h
@@ -1,5 +1,7 @@
-#ifndef __C__
-#define __C__
+#pragma once
+#ifndef XRCORE_COLOR_H
+#define XRCORE_COLOR_H
+#include "vector.h" // clampr
 
 // maps unsigned 8 bits/channel to D3DCOLOR
 ICF u32 color_argb(u32 a, u32 r, u32 g, u32 b)
@@ -256,4 +258,4 @@ BOOL _valid(const _color<T>& c)
     return _valid(c.r) && _valid(c.g) && _valid(c.b) && _valid(c.a);
 }
 
-#endif
+#endif // XRCORE_COLOR_H
diff --git a/src/xrCore/_plane.h b/src/xrCore/_plane.h
@@ -1,5 +1,8 @@
+#pragma once
 #ifndef _PLANE
 #define _PLANE
+#include "_vector3d.h"
+#include "_matrix.h"
 
 template <class T>
 class _plane
diff --git a/src/xrCore/_rect.h b/src/xrCore/_rect.h
@@ -1,5 +1,7 @@
+#pragma once
 #ifndef __FRECT
 #define __FRECT
+#include "_vector2.h"
 
 template <class T>
 struct _rect
diff --git a/src/xrCore/_std_extensions.h b/src/xrCore/_std_extensions.h
@@ -1,3 +1,4 @@
+#pragma once
 #ifndef _STD_EXT_internal
 #define _STD_EXT_internal
 
@@ -82,7 +83,7 @@ IC LPCSTR get_token_name(xr_token* tokens, int key)
 IC int get_token_id(xr_token* tokens, LPCSTR key)
 {
     for (int k = 0; tokens[k].name; k++)
-        if (stricmp(tokens[k].name, key) == 0)
+        if (_stricmp(tokens[k].name, key) == 0)
             return tokens[k].id;
     return -1;
 }
@@ -183,7 +184,7 @@ IC u32 xr_strlen(const char* S);
 IC char* strext(const char* S) { return (char*)strrchr(S, '.'); }
 IC u32 xr_strlen(const char* S) { return (u32)strlen(S); }
 IC char* xr_strupr(char* S) { return _strupr(S); }
-IC char* xr_strlwr(char* S) { return strlwr(S); }
+IC char* xr_strlwr(char* S) { return _strlwr(S); }
 #ifdef BREAK_AT_STRCMP
 XRCORE_API int xr_strcmp(const char* S1, const char* S2);
 #else
diff --git a/src/xrCore/_vector2.h b/src/xrCore/_vector2.h
@@ -1,7 +1,16 @@
+#pragma once
 #ifndef __V2D__
 #define __V2D__
 #include "Common/inlining_macros.h"
 
+#ifdef min
+# undef min
+#endif
+#ifdef max
+# undef max
+#endif
+
+
 template <class T>
 struct _vector2
 {
diff --git a/src/xrCore/_vector3d.h b/src/xrCore/_vector3d.h
@@ -1,3 +1,4 @@
+#pragma once
 #ifndef __V3D__
 #define __V3D__
 // XXX: review
diff --git a/src/xrCore/log.h b/src/xrCore/log.h
@@ -1,5 +1,11 @@
+#pragma once
 #ifndef logH
 #define logH
+#include "Common/Platform.hpp"
+#include "xrCore_impexp.h"
+
+class shared_str;
+template <typename T, typename allocator> class xr_vector;
 
 #define VPUSH(a) ((a).x), ((a).y), ((a).z)
 
diff --git a/src/xrCore/memory_monitor.h b/src/xrCore/memory_monitor.h
@@ -1,3 +1,4 @@
+#pragma once
 #ifndef MEMORY_MONITOR_H
 #define MEMORY_MONITOR_H
 
@@ -9,6 +10,8 @@
 
 #ifdef USE_MEMORY_MONITOR
 
+#include "xrCore_impexp.h"
+
 namespace memory_monitor
 {
 XRCORE_API void flush_each_time(const bool& value);
diff --git a/src/xrCore/xrMemory.h b/src/xrCore/xrMemory.h
@@ -1,6 +1,6 @@
+#pragma once
 #ifndef xrMemoryH
 #define xrMemoryH
-#pragma once
 
 #include "memory_monitor.h"
 
diff --git a/src/xrCore/xr_shared.h b/src/xrCore/xr_shared.h
@@ -1,6 +1,8 @@
 #ifndef xr_sharedH
 #define xr_sharedH
 #pragma once
+#include "_stl_extensions.h"
+#include "xrstring.h"
 
 class XRCORE_API shared_value
 {
diff --git a/src/xrCore/xrsharedmem.h b/src/xrCore/xrsharedmem.h
@@ -1,6 +1,10 @@
+#pragma once
 #ifndef xrsharedmemH
 #define xrsharedmemH
-#pragma once
+
+#include "Threading/Lock.hpp"
+#include "_stl_extensions.h"
+#include "xrCore_impexp.h"
 
 #pragma pack(push, 4)
 //////////////////////////////////////////////////////////////////////////
diff --git a/src/xrEngine/IPhysicsGeometry.h b/src/xrEngine/IPhysicsGeometry.h
@@ -1,3 +1,4 @@
+#pragma once
 #ifndef __IPHYSICS_GEOMETRY_H__
 #define __IPHYSICS_GEOMETRY_H__
 
diff --git a/src/xrGame/alife_graph_registry.h b/src/xrGame/alife_graph_registry.h
@@ -12,6 +12,7 @@
 #include "alife_level_registry.h"
 
 class CSE_ALifeCreatureActor;
+class CSE_ALifeInventoryItem;
 
 class CALifeGraphRegistry
 {
diff --git a/src/xrGame/inventory_item.h b/src/xrGame/inventory_item.h
@@ -39,7 +39,7 @@ class CInventoryOwner;
 struct SHit;
 
 class CSE_ALifeInventoryItem;
-typedef CSE_ALifeInventoryItem::mask_num_items mask_inv_num_items;
+typedef typename CSE_ALifeInventoryItem::mask_num_items mask_inv_num_items;
 
 struct net_update_IItem
 {
diff --git a/src/xrPhysics/PHCharacter.h b/src/xrPhysics/PHCharacter.h
@@ -22,10 +22,14 @@ enum EHitType;
 };
 static enum EEnvironment { peOnGround, peAtWall, peInAir };
 
-class CPHCharacter : public CPHObject, public CPHSynchronize, public CPHDisablingTranslational, public IPhysicsElement
+class CPHCharacter :
+    public CPHObject,
+    public CPHSynchronize,
+    public CPHDisablingTranslational,
+    public IPhysicsElement
 #if 0
 #ifdef DEBUG
-	,public pureRender
+    ,public pureRender
 #endif
 #endif
 {
diff --git a/src/xrServerEntities/xrServer_Objects_ALife.h b/src/xrServerEntities/xrServer_Objects_ALife.h
@@ -30,6 +30,7 @@ class CSE_ALifeObject;
 class CALifeSmartTerrainTask;
 #endif //#ifdef XRGAME_EXPORTS
 class CALifeMonsterAbstract;
+class CSE_ALifeInventoryItem;
 
 struct SFillPropData
 {
diff --git a/src/xrServerEntities/xrServer_Objects_ALife_Items.h b/src/xrServerEntities/xrServer_Objects_ALife_Items.h
@@ -1,3 +1,4 @@
+#pragma once
 ////////////////////////////////////////////////////////////////////////////
 //	Module 		: xrServer_Objects_ALife.h
 //	Created 	: 19.09.2002

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,9 @@`
	`1`	`+#pragma once`
`1`	`2`	`#ifndef VERTEX_CACHE_H`
`2`	`3`	`#define VERTEX_CACHE_H`
	`4`	`+#include"Common/inlining_macros.h"`
	`5`	`+#include"xrCore/_types.h"`
	`6`	`+#include"xrCore/_stl_extensions.h"`
`3`	`7`
`4`	`8`	`class VertexCache`
`5`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -91,15 +91,15 @@ class Shader_xrLC_LIB`
`91`	`91`	`u32 GetID(LPCSTR name) const`
`92`	`92`	`{`
`93`	`93`	`for (auto it = library.begin(); it != library.end(); it++)`
`94`		`- if (0 == stricmp(name, it->Name))`
	`94`	`+ if (0 == _stricmp(name, it->Name))`
`95`	`95`	`return u32(it - library.begin());`
`96`	`96`	`return u32(-1);`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`Shader_xrLC* Get(LPCSTR name)`
`100`	`100`	`{`
`101`	`101`	`for (auto& shader : library)`
`102`		`- if (0 == stricmp(name, shader.Name))`
	`102`	`+ if (0 == _stricmp(name, shader.Name))`
`103`	`103`	`return &shader;`
`104`	`104`	`return nullptr;`
`105`	`105`	`}`
`@@ -117,7 +117,7 @@ class Shader_xrLC_LIB`
`117`	`117`	`void Remove(LPCSTR name)`
`118`	`118`	`{`
`119`	`119`	`for (auto it = library.begin(); it != library.end(); it++)`
`120`		`- if (0 == stricmp(name, it->Name))`
	`120`	`+ if (0 == _stricmp(name, it->Name))`
`121`	`121`	`{`
`122`	`122`	`library.erase(it);`
`123`	`123`	`break;`