From d1f04504011abfaeda1bda601ab4d022f5f8e9ad Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Sat, 6 Oct 2018 17:38:44 -1000 Subject: [PATCH] Convert to pragma once --- hecl/driver/ToolBase.hpp | 4 +--- hecl/driver/ToolCook.hpp | 4 +--- hecl/driver/ToolExtract.hpp | 4 +--- hecl/driver/ToolHelp.hpp | 4 +--- hecl/driver/ToolImage.hpp | 4 +--- hecl/driver/ToolInit.hpp | 4 +--- hecl/driver/ToolPackage.hpp | 4 +--- hecl/driver/ToolSpec.hpp | 4 +--- hecl/extern/athena | 2 +- hecl/extern/boo | 2 +- hecl/include/hecl/Backend/Backend.hpp | 4 +--- hecl/include/hecl/Backend/GLSL.hpp | 4 +--- hecl/include/hecl/Backend/GX.hpp | 4 +--- hecl/include/hecl/Backend/HLSL.hpp | 4 +--- hecl/include/hecl/Backend/Metal.hpp | 4 +--- hecl/include/hecl/Backend/ProgrammableCommon.hpp | 4 +--- hecl/include/hecl/BitVector.hpp | 4 +--- hecl/include/hecl/Blender/Connection.hpp | 4 +--- hecl/include/hecl/Blender/Token.hpp | 4 +--- hecl/include/hecl/CVar.hpp | 4 +--- hecl/include/hecl/CVarCommons.hpp | 4 +--- hecl/include/hecl/CVarManager.hpp | 4 +--- hecl/include/hecl/ClientProcess.hpp | 4 +--- hecl/include/hecl/Console.hpp | 4 +--- hecl/include/hecl/Database.hpp | 4 +--- hecl/include/hecl/FourCC.hpp | 4 +--- hecl/include/hecl/Frontend.hpp | 4 +--- hecl/include/hecl/HMDLMeta.hpp | 4 +--- hecl/include/hecl/MathExtras.hpp | 4 +--- hecl/include/hecl/MultiProgressPrinter.hpp | 4 +--- hecl/include/hecl/Runtime.hpp | 4 +--- hecl/include/hecl/SteamFinder.hpp | 4 +--- hecl/include/hecl/SystemChar.hpp | 4 +--- hecl/include/hecl/UniformBufferPool.hpp | 4 +--- hecl/include/hecl/VertexBufferPool.hpp | 4 +--- hecl/include/hecl/hecl.hpp | 4 +--- hecl/include/hecl/winsupport.hpp | 4 +--- 37 files changed, 37 insertions(+), 107 deletions(-) diff --git a/hecl/driver/ToolBase.hpp b/hecl/driver/ToolBase.hpp index 605f7a8e3..75f849ccb 100644 --- a/hecl/driver/ToolBase.hpp +++ b/hecl/driver/ToolBase.hpp @@ -1,5 +1,4 @@ -#ifndef CTOOL_BASE -#define CTOOL_BASE +#pragma once #include #include @@ -274,4 +273,3 @@ static hecl::SystemString MakePathArgAbsolute(const hecl::SystemString& arg, #endif } -#endif // CTOOL_BASE diff --git a/hecl/driver/ToolCook.hpp b/hecl/driver/ToolCook.hpp index 91a8ed91a..cd512d0df 100644 --- a/hecl/driver/ToolCook.hpp +++ b/hecl/driver/ToolCook.hpp @@ -1,5 +1,4 @@ -#ifndef CTOOL_COOK -#define CTOOL_COOK +#pragma once #include "ToolBase.hpp" #include @@ -180,4 +179,3 @@ public: } }; -#endif // CTOOL_COOK diff --git a/hecl/driver/ToolExtract.hpp b/hecl/driver/ToolExtract.hpp index da2a86e03..488b9bbde 100644 --- a/hecl/driver/ToolExtract.hpp +++ b/hecl/driver/ToolExtract.hpp @@ -1,5 +1,4 @@ -#ifndef CTOOL_EXTRACT -#define CTOOL_EXTRACT +#pragma once #include "ToolBase.hpp" #include @@ -184,4 +183,3 @@ public: } }; -#endif // CTOOL_EXTRACT diff --git a/hecl/driver/ToolHelp.hpp b/hecl/driver/ToolHelp.hpp index 1e957eab8..97d494118 100644 --- a/hecl/driver/ToolHelp.hpp +++ b/hecl/driver/ToolHelp.hpp @@ -1,5 +1,4 @@ -#ifndef CTOOL_HELP -#define CTOOL_HELP +#pragma once #include "ToolBase.hpp" #include @@ -91,4 +90,3 @@ public: } }; -#endif // CTOOL_HELP diff --git a/hecl/driver/ToolImage.hpp b/hecl/driver/ToolImage.hpp index 09a2139c3..15eb97d45 100644 --- a/hecl/driver/ToolImage.hpp +++ b/hecl/driver/ToolImage.hpp @@ -1,5 +1,4 @@ -#ifndef CTOOL_IMAGE -#define CTOOL_IMAGE +#pragma once #if HECL_HAS_NOD @@ -156,4 +155,3 @@ public: #endif -#endif // CTOOL_IMAGE diff --git a/hecl/driver/ToolInit.hpp b/hecl/driver/ToolInit.hpp index 87a231a51..9818b06f6 100644 --- a/hecl/driver/ToolInit.hpp +++ b/hecl/driver/ToolInit.hpp @@ -1,5 +1,4 @@ -#ifndef CTOOL_INIT -#define CTOOL_INIT +#pragma once #include "ToolBase.hpp" #include @@ -85,4 +84,3 @@ public: hecl::SystemString toolName() const {return _S("init");} }; -#endif // CTOOL_INIT diff --git a/hecl/driver/ToolPackage.hpp b/hecl/driver/ToolPackage.hpp index 2c7f93d95..46150d0d9 100644 --- a/hecl/driver/ToolPackage.hpp +++ b/hecl/driver/ToolPackage.hpp @@ -1,5 +1,4 @@ -#ifndef CTOOL_PACKAGE -#define CTOOL_PACKAGE +#pragma once #include #include @@ -215,4 +214,3 @@ public: } }; -#endif // CTOOL_PACKAGE diff --git a/hecl/driver/ToolSpec.hpp b/hecl/driver/ToolSpec.hpp index 77930284b..bfc03d40e 100644 --- a/hecl/driver/ToolSpec.hpp +++ b/hecl/driver/ToolSpec.hpp @@ -1,5 +1,4 @@ -#ifndef CTOOL_SPEC -#define CTOOL_SPEC +#pragma once #include "ToolBase.hpp" #include @@ -155,4 +154,3 @@ public: } }; -#endif // CTOOL_SPEC diff --git a/hecl/extern/athena b/hecl/extern/athena index 5f2611702..0cdfd0ad9 160000 --- a/hecl/extern/athena +++ b/hecl/extern/athena @@ -1 +1 @@ -Subproject commit 5f2611702d4989097a850d8a5705184392d8510c +Subproject commit 0cdfd0ad9f14599a53bb3577ef6481807191616d diff --git a/hecl/extern/boo b/hecl/extern/boo index 528b35062..bba2486c1 160000 --- a/hecl/extern/boo +++ b/hecl/extern/boo @@ -1 +1 @@ -Subproject commit 528b350626332d2c584d665b221ea437f9b0c0f6 +Subproject commit bba2486c15498a307eb1c009edba09ec10a10294 diff --git a/hecl/include/hecl/Backend/Backend.hpp b/hecl/include/hecl/Backend/Backend.hpp index 8f6433798..d0323191a 100644 --- a/hecl/include/hecl/Backend/Backend.hpp +++ b/hecl/include/hecl/Backend/Backend.hpp @@ -1,5 +1,4 @@ -#ifndef HECLBACKEND_HPP -#define HECLBACKEND_HPP +#pragma once #include "hecl/Frontend.hpp" @@ -238,4 +237,3 @@ template <> struct hash }; } -#endif // HECLBACKEND_HPP diff --git a/hecl/include/hecl/Backend/GLSL.hpp b/hecl/include/hecl/Backend/GLSL.hpp index 2f911a723..7783e0aec 100644 --- a/hecl/include/hecl/Backend/GLSL.hpp +++ b/hecl/include/hecl/Backend/GLSL.hpp @@ -1,5 +1,4 @@ -#ifndef HECLBACKEND_GLSL_HPP -#define HECLBACKEND_GLSL_HPP +#pragma once #include "ProgrammableCommon.hpp" @@ -46,4 +45,3 @@ private: } -#endif // HECLBACKEND_GLSL_HPP diff --git a/hecl/include/hecl/Backend/GX.hpp b/hecl/include/hecl/Backend/GX.hpp index b17aff35d..8f82ca20a 100644 --- a/hecl/include/hecl/Backend/GX.hpp +++ b/hecl/include/hecl/Backend/GX.hpp @@ -1,5 +1,4 @@ -#ifndef HECLBACKEND_GX_HPP -#define HECLBACKEND_GX_HPP +#pragma once #include "Backend.hpp" #include @@ -591,4 +590,3 @@ private: } -#endif // HECLBACKEND_GX_HPP diff --git a/hecl/include/hecl/Backend/HLSL.hpp b/hecl/include/hecl/Backend/HLSL.hpp index 39ea3ddc1..f8c65e845 100644 --- a/hecl/include/hecl/Backend/HLSL.hpp +++ b/hecl/include/hecl/Backend/HLSL.hpp @@ -1,5 +1,4 @@ -#ifndef HECLBACKEND_HLSL_HPP -#define HECLBACKEND_HLSL_HPP +#pragma once #include "ProgrammableCommon.hpp" @@ -42,4 +41,3 @@ private: } -#endif // HECLBACKEND_HLSL_HPP diff --git a/hecl/include/hecl/Backend/Metal.hpp b/hecl/include/hecl/Backend/Metal.hpp index dd7f9d2d6..49a1a0996 100644 --- a/hecl/include/hecl/Backend/Metal.hpp +++ b/hecl/include/hecl/Backend/Metal.hpp @@ -1,5 +1,4 @@ -#ifndef HECLBACKEND_METAL_HPP -#define HECLBACKEND_METAL_HPP +#pragma once #include "ProgrammableCommon.hpp" @@ -44,4 +43,3 @@ private: } -#endif // HECLBACKEND_METAL_HPP diff --git a/hecl/include/hecl/Backend/ProgrammableCommon.hpp b/hecl/include/hecl/Backend/ProgrammableCommon.hpp index 8caa5b74a..a058e6815 100644 --- a/hecl/include/hecl/Backend/ProgrammableCommon.hpp +++ b/hecl/include/hecl/Backend/ProgrammableCommon.hpp @@ -1,5 +1,4 @@ -#ifndef HECLBACKEND_PROGCOMMON_HPP -#define HECLBACKEND_PROGCOMMON_HPP +#pragma once #include "Backend.hpp" #include "hecl/Runtime.hpp" @@ -136,4 +135,3 @@ private: } -#endif // HECLBACKEND_PROGCOMMON_HPP diff --git a/hecl/include/hecl/BitVector.hpp b/hecl/include/hecl/BitVector.hpp index 915fd9046..d0ac5ff90 100644 --- a/hecl/include/hecl/BitVector.hpp +++ b/hecl/include/hecl/BitVector.hpp @@ -11,8 +11,7 @@ // //===----------------------------------------------------------------------===// -#ifndef HECL_LLVM_ADT_BITVECTOR_H -#define HECL_LLVM_ADT_BITVECTOR_H +#pragma once #include "MathExtras.hpp" #include @@ -615,4 +614,3 @@ namespace std { } } // end namespace std -#endif // LLVM_ADT_BITVECTOR_H diff --git a/hecl/include/hecl/Blender/Connection.hpp b/hecl/include/hecl/Blender/Connection.hpp index ea761fd88..48345a32f 100644 --- a/hecl/include/hecl/Blender/Connection.hpp +++ b/hecl/include/hecl/Blender/Connection.hpp @@ -1,5 +1,4 @@ -#ifndef BLENDERCONNECTION_HPP -#define BLENDERCONNECTION_HPP +#pragma once #if _WIN32 #ifndef WIN32_LEAN_AND_MEAN @@ -715,4 +714,3 @@ public: } -#endif // BLENDERCONNECTION_HPP diff --git a/hecl/include/hecl/Blender/Token.hpp b/hecl/include/hecl/Blender/Token.hpp index 1ace6b07e..3d6b214fe 100644 --- a/hecl/include/hecl/Blender/Token.hpp +++ b/hecl/include/hecl/Blender/Token.hpp @@ -1,5 +1,4 @@ -#ifndef HECL_BLENDERTOKEN_HPP -#define HECL_BLENDERTOKEN_HPP +#pragma once #include @@ -24,4 +23,3 @@ public: } -#endif // HECL_BLENDERTOKEN_HPP diff --git a/hecl/include/hecl/CVar.hpp b/hecl/include/hecl/CVar.hpp index e778e4d1c..3e7868a3f 100755 --- a/hecl/include/hecl/CVar.hpp +++ b/hecl/include/hecl/CVar.hpp @@ -1,5 +1,4 @@ -#ifndef CVAR_HPP -#define CVAR_HPP +#pragma once #include #include @@ -157,5 +156,4 @@ public: }; } -#endif // CVAR_HPP diff --git a/hecl/include/hecl/CVarCommons.hpp b/hecl/include/hecl/CVarCommons.hpp index 6f5cb8685..c631181bd 100644 --- a/hecl/include/hecl/CVarCommons.hpp +++ b/hecl/include/hecl/CVarCommons.hpp @@ -1,5 +1,4 @@ -#ifndef CVARCOMMONS_HPP -#define CVARCOMMONS_HPP +#pragma once #include "CVarManager.hpp" @@ -91,4 +90,3 @@ struct CVarCommons } -#endif // CVARCOMMONS_HPP diff --git a/hecl/include/hecl/CVarManager.hpp b/hecl/include/hecl/CVarManager.hpp index 8f2714cee..1576b2ad1 100755 --- a/hecl/include/hecl/CVarManager.hpp +++ b/hecl/include/hecl/CVarManager.hpp @@ -1,5 +1,4 @@ -#ifndef CVARMANAGER_HPP -#define CVARMANAGER_HPP +#pragma once #include #include @@ -89,4 +88,3 @@ private: } -#endif // CVARMANAGER_HPP diff --git a/hecl/include/hecl/ClientProcess.hpp b/hecl/include/hecl/ClientProcess.hpp index 83bdfbe76..7a05fde3f 100644 --- a/hecl/include/hecl/ClientProcess.hpp +++ b/hecl/include/hecl/ClientProcess.hpp @@ -1,5 +1,4 @@ -#ifndef HECL_CLIENT_PROCESS_HPP -#define HECL_CLIENT_PROCESS_HPP +#pragma once #include "hecl.hpp" #include "Database.hpp" @@ -118,4 +117,3 @@ public: } -#endif // HECL_CLIENT_PROCESS_HPP diff --git a/hecl/include/hecl/Console.hpp b/hecl/include/hecl/Console.hpp index 8f0676368..8ee0b0109 100644 --- a/hecl/include/hecl/Console.hpp +++ b/hecl/include/hecl/Console.hpp @@ -1,5 +1,4 @@ -#ifndef __URDE_CONSOLE_HPP__ -#define __URDE_CONSOLE_HPP__ +#pragma once #include #include @@ -113,4 +112,3 @@ public: }; } -#endif // __URDE_CONSOLE_HPP__ diff --git a/hecl/include/hecl/Database.hpp b/hecl/include/hecl/Database.hpp index d06568571..739f586ef 100644 --- a/hecl/include/hecl/Database.hpp +++ b/hecl/include/hecl/Database.hpp @@ -1,5 +1,4 @@ -#ifndef HECLDATABASE_HPP -#define HECLDATABASE_HPP +#pragma once #include #include @@ -481,4 +480,3 @@ public: } } -#endif // HECLDATABASE_HPP diff --git a/hecl/include/hecl/FourCC.hpp b/hecl/include/hecl/FourCC.hpp index 30916de52..bedaf9f9b 100644 --- a/hecl/include/hecl/FourCC.hpp +++ b/hecl/include/hecl/FourCC.hpp @@ -1,5 +1,4 @@ -#ifndef HECL_FOURCC_HPP -#define HECL_FOURCC_HPP +#pragma once #include #include @@ -59,4 +58,3 @@ template <> struct hash }; } -#endif // HECL_FOURCC_HPP diff --git a/hecl/include/hecl/Frontend.hpp b/hecl/include/hecl/Frontend.hpp index 8ab51f0ba..0748281be 100644 --- a/hecl/include/hecl/Frontend.hpp +++ b/hecl/include/hecl/Frontend.hpp @@ -1,5 +1,4 @@ -#ifndef HECLFRONTEND_HPP -#define HECLFRONTEND_HPP +#pragma once #include #include @@ -378,4 +377,3 @@ public: } -#endif // HECLFRONTEND_HPP diff --git a/hecl/include/hecl/HMDLMeta.hpp b/hecl/include/hecl/HMDLMeta.hpp index 35fe22bd4..14c509de7 100644 --- a/hecl/include/hecl/HMDLMeta.hpp +++ b/hecl/include/hecl/HMDLMeta.hpp @@ -1,5 +1,4 @@ -#ifndef HMDLMETA_HPP -#define HMDLMETA_HPP +#pragma once #include "hecl/hecl.hpp" #include "athena/DNA.hpp" @@ -31,4 +30,3 @@ struct HMDLMeta : athena::io::DNA } -#endif // HMDLMETA_HPP diff --git a/hecl/include/hecl/MathExtras.hpp b/hecl/include/hecl/MathExtras.hpp index 9d02e59af..fb15e54a2 100644 --- a/hecl/include/hecl/MathExtras.hpp +++ b/hecl/include/hecl/MathExtras.hpp @@ -11,8 +11,7 @@ // //===----------------------------------------------------------------------===// -#ifndef HECL_LLVM_SUPPORT_MATHEXTRAS_H -#define HECL_LLVM_SUPPORT_MATHEXTRAS_H +#pragma once /// \macro LLVM_GNUC_PREREQ /// \brief Extend the default __GNUC_PREREQ even if glibc's features.h isn't @@ -854,4 +853,3 @@ extern const float huge_valf; } // End llvm namespace } // End hecl namespace -#endif diff --git a/hecl/include/hecl/MultiProgressPrinter.hpp b/hecl/include/hecl/MultiProgressPrinter.hpp index cb4426361..fbcc645cc 100644 --- a/hecl/include/hecl/MultiProgressPrinter.hpp +++ b/hecl/include/hecl/MultiProgressPrinter.hpp @@ -1,5 +1,4 @@ -#ifndef HECLMULTIPROGRESSPRINTER_HPP -#define HECLMULTIPROGRESSPRINTER_HPP +#pragma once #include "hecl.hpp" #include @@ -58,4 +57,3 @@ public: } -#endif // HECLMULTIPROGRESSPRINTER_HPP diff --git a/hecl/include/hecl/Runtime.hpp b/hecl/include/hecl/Runtime.hpp index fadb4628a..8685ca88e 100644 --- a/hecl/include/hecl/Runtime.hpp +++ b/hecl/include/hecl/Runtime.hpp @@ -1,5 +1,4 @@ -#ifndef HECLRUNTIME_HPP -#define HECLRUNTIME_HPP +#pragma once #include "hecl.hpp" #include "boo/graphicsdev/IGraphicsDataFactory.hpp" @@ -56,4 +55,3 @@ struct HMDLData } } -#endif // HECLRUNTIME_HPP diff --git a/hecl/include/hecl/SteamFinder.hpp b/hecl/include/hecl/SteamFinder.hpp index dc93765dd..e5bf517e3 100644 --- a/hecl/include/hecl/SteamFinder.hpp +++ b/hecl/include/hecl/SteamFinder.hpp @@ -1,5 +1,4 @@ -#ifndef _HECL_STEAMFINDER_H_ -#define _HECL_STEAMFINDER_H_ +#pragma once #include "hecl/SystemChar.hpp" @@ -11,4 +10,3 @@ hecl::SystemString FindCommonSteamApp(const hecl::SystemChar* name); } -#endif // _HECL_STEAMFINDER_H_ diff --git a/hecl/include/hecl/SystemChar.hpp b/hecl/include/hecl/SystemChar.hpp index 939e7b9e9..465f810cc 100644 --- a/hecl/include/hecl/SystemChar.hpp +++ b/hecl/include/hecl/SystemChar.hpp @@ -1,5 +1,4 @@ -#ifndef SYSTEMCHAR_HPP -#define SYSTEMCHAR_HPP +#pragma once #ifndef _WIN32 #include @@ -62,4 +61,3 @@ typedef struct stat Sstat; } -#endif diff --git a/hecl/include/hecl/UniformBufferPool.hpp b/hecl/include/hecl/UniformBufferPool.hpp index 6a79dc62d..9c2edb448 100644 --- a/hecl/include/hecl/UniformBufferPool.hpp +++ b/hecl/include/hecl/UniformBufferPool.hpp @@ -1,5 +1,4 @@ -#ifndef HECL_UNIFORMBUFFERPOOL_HPP -#define HECL_UNIFORMBUFFERPOOL_HPP +#pragma once #include #include @@ -204,4 +203,3 @@ public: } -#endif // HECL_UNIFORMBUFFERPOOL_HPP diff --git a/hecl/include/hecl/VertexBufferPool.hpp b/hecl/include/hecl/VertexBufferPool.hpp index 082c09b83..cd914085f 100644 --- a/hecl/include/hecl/VertexBufferPool.hpp +++ b/hecl/include/hecl/VertexBufferPool.hpp @@ -1,5 +1,4 @@ -#ifndef HECL_VERTEXBUFFERPOOL_HPP -#define HECL_VERTEXBUFFERPOOL_HPP +#pragma once #include #include @@ -208,4 +207,3 @@ public: } -#endif // HECL_VERTEXBUFFERPOOL_HPP diff --git a/hecl/include/hecl/hecl.hpp b/hecl/include/hecl/hecl.hpp index 568573ae4..df4ef2792 100644 --- a/hecl/include/hecl/hecl.hpp +++ b/hecl/include/hecl/hecl.hpp @@ -1,5 +1,4 @@ -#ifndef HECL_HPP -#define HECL_HPP +#pragma once #ifndef _WIN32 #include @@ -1468,4 +1467,3 @@ template <> struct hash }; } -#endif // HECL_HPP diff --git a/hecl/include/hecl/winsupport.hpp b/hecl/include/hecl/winsupport.hpp index 92e2352dc..8715cd99e 100644 --- a/hecl/include/hecl/winsupport.hpp +++ b/hecl/include/hecl/winsupport.hpp @@ -1,5 +1,4 @@ -#ifndef _HECL_WINSUPPORT_H_ -#define _HECL_WINSUPPORT_H_ +#pragma once #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN 1 @@ -12,4 +11,3 @@ void* memmem(const void *haystack, size_t hlen, const void *needle, size_t nlen); int asprintf(char** buf, const char* format, ...); -#endif // _HECL_WINSUPPORT_H_