Remove some include guards

OpenXRay · Nov 15, 2017 · dd2616a · dd2616a
1 parent 038d860
commit dd2616a
Show file tree

Hide file tree

Showing 25 changed files with 15 additions and 111 deletions.
diff --git a/src/editors/ParticleEditor/noise.h b/src/editors/ParticleEditor/noise.h
@@ -1,8 +1,5 @@
-#ifndef noiseH
-#define noiseH
+#pragma once
 
 float noise3(const Fvector& vec);
 float fractalsum3(const Fvector& v, float freq, int octaves);
 float turbulence3(const Fvector& v, float freq, int octaves);
-
-#endif
diff --git a/src/utils/ETools/xrXRC.h b/src/utils/ETools/xrXRC.h
@@ -3,8 +3,6 @@
 //////////////////////////////////////////////////////////////////////
 
 #pragma once
-#if !defined(AFX_XRXRC_H__9AA25268_621F_4FCA_BD75_AF2E9822B8E3__INCLUDED_)
-#define AFX_XRXRC_H__9AA25268_621F_4FCA_BD75_AF2E9822B8E3__INCLUDED_
 
 #include "xrCDB/xrCDB.h"
 #include "xrCore/_fbox.h"
@@ -76,5 +74,3 @@ class ENGINE_API xrXRC
     IC void r_clear() { CL.r_clear(); };
 };
 ENGINE_API extern xrXRC XRC;
-
-#endif // !defined(AFX_XRXRC_H__9AA25268_621F_4FCA_BD75_AF2E9822B8E3__INCLUDED_)
diff --git a/src/xrCDB/Frustum.h b/src/xrCDB/Frustum.h
@@ -1,15 +1,11 @@
 // Frustum.h: interface for the CFrustum class.
 //
 //////////////////////////////////////////////////////////////////////
-
-#if !defined(AFX_FRUSTUM_H__E66ED755_F741_49CF_8B2A_404CCF7067F2__INCLUDED_)
-#define AFX_FRUSTUM_H__E66ED755_F741_49CF_8B2A_404CCF7067F2__INCLUDED_
+#pragma once
 
 #include "xrCDB.h"
 
-//#pragma once
-
-#include "xrCore/fixedvector.h"
+#include "xrCore/FixedVector.h"
 
 #pragma pack(push, 4)
 
@@ -102,5 +98,3 @@ class XRCDB_API CFrustum
     }
 };
 #pragma pack(pop)
-
-#endif // !defined(AFX_FRUSTUM_H__E66ED755_F741_49CF_8B2A_404CCF7067F2__INCLUDED_)
diff --git a/src/xrCDB/ISpatial.h b/src/xrCDB/ISpatial.h
@@ -1,6 +1,4 @@
 #pragma once
-#ifndef XRENGINE_ISPATIAL_H_INCLUDED
-#define XRENGINE_ISPATIAL_H_INCLUDED
 
 #include "xrCore/xrPool.h"
 //#include "xr_collide_defs.h"
@@ -16,7 +14,7 @@
 0. Generic
     * O(1) insertion
         - radius completely determines	"level"
-        - position completely detemines "node"
+        - position completely determines "node"
     * O(1) removal
     *
 1. Rendering
@@ -276,5 +274,3 @@ XRCDB_API extern ISpatial_DB* g_SpatialSpace;
 XRCDB_API extern ISpatial_DB* g_SpatialSpacePhysic;
 
 #pragma pack(pop)
-
-#endif // #ifndef XRENGINE_ISPATIAL_H_INCLUDED
diff --git a/src/xrCDB/Intersect.hpp b/src/xrCDB/Intersect.hpp
@@ -1,7 +1,5 @@
-//---------------------------------------------------------------------------
 #pragma once
-#ifndef intersectH
-#define intersectH
+
 #include "xrCore/_matrix33.h"
 #include "xrCore/_obb.h"
 #include "xrCore/_sphere.h"
@@ -916,7 +914,4 @@ IC bool TestRayOBB(const Fvector3& origin, const Fvector3& direction, const Fobb
 
     return true;
 }
-//----------------------------------------------------------------------------
-};
-
-#endif
+} // namespace CDB
diff --git a/src/xrCDB/xrCDB.h b/src/xrCDB/xrCDB.h
@@ -1,6 +1,4 @@
-//#pragma once
-#ifndef XRCDB_H
-#define XRCDB_H
+#pragma once
 
 #include "xrCore/Threading/Lock.hpp" // XXX: Remove from header. Put in .cpp.
 
@@ -229,7 +227,5 @@ class XRCDB_API CollectorPacked : public non_copyable
     void clear();
 };
 #pragma warning(pop)
-};
-
+}
 #pragma pack(pop)
-#endif
diff --git a/src/xrCDB/xrXRC.h b/src/xrCDB/xrXRC.h
@@ -2,9 +2,7 @@
 //
 //////////////////////////////////////////////////////////////////////
 
-#if !defined(AFX_XRXRC_H__9AA25268_621F_4FCA_BD75_AF2E9822B8E3__INCLUDED_)
-#define AFX_XRXRC_H__9AA25268_621F_4FCA_BD75_AF2E9822B8E3__INCLUDED_
-//#pragma once
+#pragma once
 
 #include "xrCDB.h"
 class IGameFont;
@@ -84,5 +82,3 @@ class XRCDB_API xrXRC
     xrXRC(const char* name = "<unknown>") : name(name) {}
 };
 XRCDB_API extern xrXRC XRC;
-
-#endif // !defined(AFX_XRXRC_H__9AA25268_621F_4FCA_BD75_AF2E9822B8E3__INCLUDED_)
diff --git a/src/xrCDB/xr_area.h b/src/xrCDB/xr_area.h
@@ -1,6 +1,4 @@
-#ifndef __XR_AREA_H__
-#define __XR_AREA_H__
-
+#pragma once
 #include "xr_collide_defs.h"
 
 // refs
@@ -88,5 +86,3 @@ class XRCDB_API CObjectSpace
 #endif
     void DumpStatistics(IGameFont& font, IPerformanceAlert* alert);
 };
-
-#endif //__XR_AREA_H__
diff --git a/src/xrCDB/xr_collide_defs.h b/src/xrCDB/xr_collide_defs.h
@@ -1,6 +1,4 @@
 #pragma once
-#ifndef xr_collide_defsH
-#define xr_collide_defsH
 
 #include "xrCDB.h"
 
@@ -192,4 +190,3 @@ class rq_results
 typedef BOOL rq_callback(rq_result& result, LPVOID user_data);
 typedef BOOL test_callback(const ray_defs& rd, IGameObject* object, LPVOID user_data);
 }
-#endif
diff --git a/src/xrParticles/noise.h b/src/xrParticles/noise.h
@@ -1,9 +1,5 @@
 #pragma once
-#ifndef noiseH
-#define noiseH
 
 float noise3(const Fvector& vec);
 float fractalsum3(const Fvector& v, float freq, int octaves);
 float turbulence3(const Fvector& v, float freq, int octaves);
-
-#endif
diff --git a/src/xrParticles/particle_actions.h b/src/xrParticles/particle_actions.h
@@ -1,6 +1,4 @@
 #pragma once
-#ifndef particle_actionsH
-#define particle_actionsH
 
 namespace PAPI
 {
@@ -80,7 +78,4 @@ class ParticleActions
         m_bLocked = false;
     }
 };
-};
-
-//---------------------------------------------------------------------------
-#endif
+} // namespace PAPI
diff --git a/src/xrParticles/particle_actions_collection.h b/src/xrParticles/particle_actions_collection.h
@@ -1,6 +1,4 @@
 #pragma once
-#ifndef particle_actions_collectionH
-#define particle_actions_collectionH
 
 #include "particle_actions.h"
 #include "particle_core.h"
@@ -303,7 +301,4 @@ struct PARTICLES_API PATurbulence : public ParticleAction
 
     _METHODS;
 };
-};
-
-//---------------------------------------------------------------------------
-#endif
+} // namespace PAPI
diff --git a/src/xrParticles/particle_core.h b/src/xrParticles/particle_core.h
@@ -1,6 +1,4 @@
 #pragma once
-#ifndef particle_coreH
-#define particle_coreH
 
 #define SQRT2PI 2.506628274631000502415765284811045253006f
 #define ONEOVERSQRT2PI (1.f / SQRT2PI)
@@ -33,7 +31,4 @@ struct PARTICLES_API pDomain
 #pragma pack(pop)
 // misc
 float NRand(float sigma = 1.0f);
-};
-
-//---------------------------------------------------------------------------
-#endif
+} // namespace PAPI
diff --git a/src/xrParticles/particle_manager.h b/src/xrParticles/particle_manager.h
@@ -1,6 +1,5 @@
 #pragma once
-#ifndef particle_managerH
-#define particle_managerH
+
 #include "particle_actions.h"
 
 namespace PAPI
@@ -48,7 +47,4 @@ class CParticleManager : public IParticleManager
     u32 LoadActions(int alist_id, IReader& R) override;
     void SaveActions(int alist_id, IWriter& W) override;
 };
-}
-
-//---------------------------------------------------------------------------
-#endif
+} // namespace PAPI
diff --git a/src/xrSound/OpenALDeviceList.h b/src/xrSound/OpenALDeviceList.h
@@ -1,6 +1,4 @@
 #pragma once
-#ifndef ALDEVICELIST_H
-#define ALDEVICELIST_H
 
 #include "openal/al.h"
 #include "openal/alc.h"
@@ -54,5 +52,3 @@ class ALDeviceList
     void GetDeviceVersion(u32 index, int* major, int* minor);
     void SelectBestDevice();
 };
-
-#endif // ALDEVICELIST_H
diff --git a/src/xrSound/Sound.h b/src/xrSound/Sound.h
@@ -1,6 +1,4 @@
 #pragma once
-#ifndef SoundH
-#define SoundH
 
 #include "xrCore/_types.h"
 #include "xrCore/_flags.h"
@@ -315,5 +313,3 @@ class XRSOUND_API CSound_manager_interface
 
 class CSound_manager_interface;
 extern XRSOUND_API CSound_manager_interface* Sound;
-
-#endif // include guard
diff --git a/src/xrSound/SoundRender.h b/src/xrSound/SoundRender.h
@@ -1,6 +1,4 @@
 #pragma once
-#ifndef SoundRenderH
-#define SoundRenderH
 
 #include "Sound.h"
 
@@ -19,5 +17,3 @@ const float s_f_def_source_footer = 0.0f; // sec of silence after buffer data, j
 const u32 sdef_env_version = 4; // current version of env-def
 const u32 sdef_level_version = 1; // current version of level-def
 const float s_f_def_event_pulse = 0.5f; // sec
-
-#endif
diff --git a/src/xrSound/SoundRender_Cache.h b/src/xrSound/SoundRender_Cache.h
@@ -1,6 +1,4 @@
 #pragma once
-#ifndef SoundRender_CacheH
-#define SoundRender_CacheH
 
 // --- just thoughts ---
 // 1. LRU scheme
@@ -74,4 +72,3 @@ class CSoundRender_Cache
     CSoundRender_Cache();
     ~CSoundRender_Cache();
 };
-#endif
diff --git a/src/xrSound/SoundRender_Core.h b/src/xrSound/SoundRender_Core.h
@@ -1,6 +1,4 @@
 #pragma once
-#ifndef SoundRender_CoreH
-#define SoundRender_CoreH
 
 #include "SoundRender.h"
 #include "SoundRender_Environment.h"
@@ -147,4 +145,3 @@ class CSoundRender_Core : public CSound_manager_interface
 };
 
 extern CSoundRender_Core* SoundRender;
-#endif
diff --git a/src/xrSound/SoundRender_CoreA.h b/src/xrSound/SoundRender_CoreA.h
@@ -1,5 +1,3 @@
-#ifndef SoundRender_CoreAH
-#define SoundRender_CoreAH
 #pragma once
 
 #include "SoundRender_Core.h"
@@ -70,4 +68,3 @@ class CSoundRender_CoreA : public CSoundRender_Core
     const Fvector& listener_position() override { return Listener.position; }
 };
 extern CSoundRender_CoreA* SoundRenderA;
-#endif
diff --git a/src/xrSound/SoundRender_Emitter.h b/src/xrSound/SoundRender_Emitter.h
@@ -1,5 +1,3 @@
-#ifndef SoundRender_EmitterH
-#define SoundRender_EmitterH
 #pragma once
 
 #include "SoundRender.h"
@@ -119,4 +117,3 @@ class CSoundRender_Emitter : public CSound_emitter
     CSoundRender_Emitter();
     ~CSoundRender_Emitter();
 };
-#endif
diff --git a/src/xrSound/SoundRender_Environment.h b/src/xrSound/SoundRender_Environment.h
@@ -1,6 +1,4 @@
 #pragma once
-#ifndef soundrender_environmentH
-#define soundrender_environmentH
 
 // refs
 class XRSOUND_EDITOR_API CSoundRender_Environment : public CSound_environment
@@ -53,4 +51,3 @@ class XRSOUND_EDITOR_API SoundEnvironment_LIB
     void Remove(int id);
     SE_VEC& Library();
 };
-#endif
diff --git a/src/xrSound/SoundRender_Source.h b/src/xrSound/SoundRender_Source.h
@@ -1,6 +1,4 @@
 #pragma once
-#ifndef SoundRender_SourceH
-#define SoundRender_SourceH
 
 #include "SoundRender_Cache.h"
 
@@ -44,4 +42,3 @@ class XRSOUND_EDITOR_API CSoundRender_Source : public CSound_source
     u16 channels_num() const override { return m_wformat.nChannels; }
     u32 bytes_total() const override { return dwBytesTotal; }
 };
-#endif
diff --git a/src/xrSound/SoundRender_Target.h b/src/xrSound/SoundRender_Target.h
@@ -1,6 +1,4 @@
 #pragma once
-#ifndef SoundRender_TargetH
-#define SoundRender_TargetH
 
 #include "SoundRender.h"
 
@@ -43,4 +41,3 @@ class CSoundRender_Target
     virtual void update() = 0;
     virtual void fill_parameters() = 0;
 };
-#endif
diff --git a/src/xrSound/SoundRender_TargetA.h b/src/xrSound/SoundRender_TargetA.h
@@ -1,5 +1,3 @@
-#ifndef SoundRender_TargetAH
-#define SoundRender_TargetAH
 #pragma once
 
 #include "Soundrender_Target.h"
@@ -34,4 +32,3 @@ class CSoundRender_TargetA : public CSoundRender_Target
     void fill_parameters() override;
     void source_changed();
 };
-#endif