From 0b52f3dbab939d98fdaaf032887f8800ca3d36c3 Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Sat, 6 Oct 2018 17:36:44 -1000 Subject: [PATCH] Convert to pragma once --- include/boo/BooObject.hpp | 4 +--- include/boo/DeferredWindowEvents.hpp | 4 +--- include/boo/IApplication.hpp | 4 +--- include/boo/IGraphicsContext.hpp | 4 +--- include/boo/IWindow.hpp | 4 +--- include/boo/System.hpp | 4 +--- include/boo/ThreadLocalPtr.hpp | 4 +--- include/boo/UWPViewProvider.hpp | 4 +--- include/boo/audiodev/IAudioSubmix.hpp | 4 +--- include/boo/audiodev/IAudioVoice.hpp | 4 +--- include/boo/audiodev/IAudioVoiceEngine.hpp | 4 +--- include/boo/audiodev/IMIDIPort.hpp | 4 +--- include/boo/audiodev/IMIDIReader.hpp | 4 +--- include/boo/audiodev/MIDIDecoder.hpp | 4 +--- include/boo/audiodev/MIDIEncoder.hpp | 4 +--- include/boo/boo.hpp | 4 +--- include/boo/graphicsdev/D3D.hpp | 4 +--- include/boo/graphicsdev/GL.hpp | 4 +--- include/boo/graphicsdev/GLSLMacros.hpp | 4 +--- include/boo/graphicsdev/IGraphicsCommandQueue.hpp | 4 +--- include/boo/graphicsdev/IGraphicsDataFactory.hpp | 4 +--- include/boo/graphicsdev/Metal.hpp | 4 +--- include/boo/graphicsdev/Vulkan.hpp | 4 +--- include/boo/graphicsdev/VulkanDispatchTable.hpp | 4 +--- include/boo/inputdev/CafeProPad.hpp | 4 +--- include/boo/inputdev/DeviceBase.hpp | 4 +--- include/boo/inputdev/DeviceFinder.hpp | 4 +--- include/boo/inputdev/DeviceSignature.hpp | 4 +--- include/boo/inputdev/DeviceToken.hpp | 4 +--- include/boo/inputdev/DolphinSmashAdapter.hpp | 4 +--- include/boo/inputdev/DualshockPad.hpp | 4 +--- include/boo/inputdev/GenericPad.hpp | 4 +--- include/boo/inputdev/HIDParser.hpp | 4 +--- include/boo/inputdev/IHIDListener.hpp | 4 +--- include/boo/inputdev/NintendoPowerA.hpp | 4 +--- include/boo/inputdev/RevolutionPad.hpp | 4 +--- include/boo/inputdev/XInputPad.hpp | 4 +--- lib/CFPointer.hpp | 4 +--- lib/Common.hpp | 4 +--- lib/audiodev/AudioMatrix.hpp | 4 +--- lib/audiodev/AudioSubmix.hpp | 4 +--- lib/audiodev/AudioVoice.hpp | 4 +--- lib/audiodev/AudioVoiceEngine.hpp | 4 +--- lib/audiodev/Common.hpp | 4 +--- lib/audiodev/LinuxMidi.hpp | 4 +--- lib/audiodev/LtRtProcessing.hpp | 4 +--- lib/audiodev/MIDICommon.hpp | 4 +--- lib/graphicsdev/Common.hpp | 4 +--- lib/inputdev/IHIDDevice.hpp | 4 +--- lib/inputdev/IOKitPointer.hpp | 4 +--- lib/mac/CocoaCommon.hpp | 4 +--- lib/win/UWPCommon.hpp | 4 +--- lib/win/Win32Common.hpp | 4 +--- lib/win/WinCommon.hpp | 4 +--- lib/x11/XlibCommon.hpp | 4 +--- logvisor | 2 +- 56 files changed, 56 insertions(+), 166 deletions(-) diff --git a/include/boo/BooObject.hpp b/include/boo/BooObject.hpp index 4eb8c4b..60f0b87 100644 --- a/include/boo/BooObject.hpp +++ b/include/boo/BooObject.hpp @@ -1,5 +1,4 @@ -#ifndef BOOOBJECT_HPP -#define BOOOBJECT_HPP +#pragma once #include #include @@ -52,4 +51,3 @@ public: } -#endif // BOOOBJECT_HPP diff --git a/include/boo/DeferredWindowEvents.hpp b/include/boo/DeferredWindowEvents.hpp index 499b004..4fe545f 100644 --- a/include/boo/DeferredWindowEvents.hpp +++ b/include/boo/DeferredWindowEvents.hpp @@ -1,5 +1,4 @@ -#ifndef BOO_DEFERREDWINDOWEVENTS_HPP -#define BOO_DEFERREDWINDOWEVENTS_HPP +#pragma once #include #include @@ -272,4 +271,3 @@ struct DeferredWindowEvents : public IWindowCallback } -#endif // BOO_DEFERREDWINDOWEVENTS_HPP diff --git a/include/boo/IApplication.hpp b/include/boo/IApplication.hpp index 49064f7..7218b15 100644 --- a/include/boo/IApplication.hpp +++ b/include/boo/IApplication.hpp @@ -1,5 +1,4 @@ -#ifndef IAPPLICATION_HPP -#define IAPPLICATION_HPP +#pragma once #include #include @@ -93,4 +92,3 @@ ApplicationRun(IApplication::EPlatformType platform, } -#endif // IAPPLICATION_HPP diff --git a/include/boo/IGraphicsContext.hpp b/include/boo/IGraphicsContext.hpp index ecdf783..2478d2d 100644 --- a/include/boo/IGraphicsContext.hpp +++ b/include/boo/IGraphicsContext.hpp @@ -1,5 +1,4 @@ -#ifndef IGFXCONTEXT_HPP -#define IGFXCONTEXT_HPP +#pragma once #include #include @@ -62,4 +61,3 @@ public: } -#endif // IGFXCONTEXT_HPP diff --git a/include/boo/IWindow.hpp b/include/boo/IWindow.hpp index 7ffad18..9324d95 100644 --- a/include/boo/IWindow.hpp +++ b/include/boo/IWindow.hpp @@ -1,5 +1,4 @@ -#ifndef IWINDOW_HPP -#define IWINDOW_HPP +#pragma once #include "System.hpp" #include @@ -321,4 +320,3 @@ public: } -#endif // IWINDOW_HPP diff --git a/include/boo/System.hpp b/include/boo/System.hpp index c3e6e5b..c87828f 100644 --- a/include/boo/System.hpp +++ b/include/boo/System.hpp @@ -1,5 +1,4 @@ -#ifndef BOO_SYSTEM_HPP -#define BOO_SYSTEM_HPP +#pragma once #ifdef _WIN32 #include @@ -88,4 +87,3 @@ namespace boo } -#endif diff --git a/include/boo/ThreadLocalPtr.hpp b/include/boo/ThreadLocalPtr.hpp index af8f9d5..8473683 100644 --- a/include/boo/ThreadLocalPtr.hpp +++ b/include/boo/ThreadLocalPtr.hpp @@ -1,5 +1,4 @@ -#ifndef BOO_THREADLOCALPTR_HPP -#define BOO_THREADLOCALPTR_HPP +#pragma once #ifndef __SWITCH__ @@ -32,4 +31,3 @@ public: #endif -#endif // BOO_THREADLOCALPTR_HPP diff --git a/include/boo/UWPViewProvider.hpp b/include/boo/UWPViewProvider.hpp index aae9378..dcc54b6 100644 --- a/include/boo/UWPViewProvider.hpp +++ b/include/boo/UWPViewProvider.hpp @@ -1,5 +1,4 @@ -#ifndef UWPVIEWPROVIDER_HPP -#define UWPVIEWPROVIDER_HPP +#pragma once #include "IApplication.hpp" @@ -43,4 +42,3 @@ internal: } -#endif // UWPVIEWPROVIDER_HPP diff --git a/include/boo/audiodev/IAudioSubmix.hpp b/include/boo/audiodev/IAudioSubmix.hpp index 4da0507..42b67a8 100644 --- a/include/boo/audiodev/IAudioSubmix.hpp +++ b/include/boo/audiodev/IAudioSubmix.hpp @@ -1,5 +1,4 @@ -#ifndef BOO_IAUDIOSUBMIX_HPP -#define BOO_IAUDIOSUBMIX_HPP +#pragma once #include #include @@ -54,4 +53,3 @@ struct IAudioSubmixCallback } -#endif // BOO_IAUDIOVOICE_HPP diff --git a/include/boo/audiodev/IAudioVoice.hpp b/include/boo/audiodev/IAudioVoice.hpp index c1d58cb..e5b6c7a 100644 --- a/include/boo/audiodev/IAudioVoice.hpp +++ b/include/boo/audiodev/IAudioVoice.hpp @@ -1,5 +1,4 @@ -#ifndef BOO_IAUDIOVOICE_HPP -#define BOO_IAUDIOVOICE_HPP +#pragma once #include #include @@ -109,4 +108,3 @@ struct IAudioVoiceCallback } -#endif // BOO_IAUDIOVOICE_HPP diff --git a/include/boo/audiodev/IAudioVoiceEngine.hpp b/include/boo/audiodev/IAudioVoiceEngine.hpp index 9aaf374..f63572c 100644 --- a/include/boo/audiodev/IAudioVoiceEngine.hpp +++ b/include/boo/audiodev/IAudioVoiceEngine.hpp @@ -1,5 +1,4 @@ -#ifndef BOO_IAUDIOVOICEENGINE_HPP -#define BOO_IAUDIOVOICEENGINE_HPP +#pragma once #include "IAudioVoice.hpp" #include "IAudioSubmix.hpp" @@ -115,4 +114,3 @@ std::unique_ptr NewWAVAudioVoiceEngine(const wchar_t* path, d } -#endif // BOO_IAUDIOVOICEENGINE_HPP diff --git a/include/boo/audiodev/IMIDIPort.hpp b/include/boo/audiodev/IMIDIPort.hpp index 7d8056e..4af9988 100644 --- a/include/boo/audiodev/IMIDIPort.hpp +++ b/include/boo/audiodev/IMIDIPort.hpp @@ -1,5 +1,4 @@ -#ifndef BOO_IMIDIPORT_HPP -#define BOO_IMIDIPORT_HPP +#pragma once #include #include @@ -61,4 +60,3 @@ public: } -#endif // BOO_IMIDIPORT_HPP diff --git a/include/boo/audiodev/IMIDIReader.hpp b/include/boo/audiodev/IMIDIReader.hpp index a84f1c8..b604a3c 100644 --- a/include/boo/audiodev/IMIDIReader.hpp +++ b/include/boo/audiodev/IMIDIReader.hpp @@ -1,5 +1,4 @@ -#ifndef BOO_IMIDIREADER_HPP -#define BOO_IMIDIREADER_HPP +#pragma once #include #include @@ -40,4 +39,3 @@ public: } -#endif // BOO_IMIDIREADER_HPP diff --git a/include/boo/audiodev/MIDIDecoder.hpp b/include/boo/audiodev/MIDIDecoder.hpp index 1b277f0..9ad3572 100644 --- a/include/boo/audiodev/MIDIDecoder.hpp +++ b/include/boo/audiodev/MIDIDecoder.hpp @@ -1,5 +1,4 @@ -#ifndef BOO_MIDIDECODER_HPP -#define BOO_MIDIDECODER_HPP +#pragma once #include "boo/audiodev/IMIDIReader.hpp" #include "boo/audiodev/IMIDIPort.hpp" @@ -25,4 +24,3 @@ public: } -#endif // BOO_MIDIDECODER_HPP diff --git a/include/boo/audiodev/MIDIEncoder.hpp b/include/boo/audiodev/MIDIEncoder.hpp index ada406a..690f639 100644 --- a/include/boo/audiodev/MIDIEncoder.hpp +++ b/include/boo/audiodev/MIDIEncoder.hpp @@ -1,5 +1,4 @@ -#ifndef BOO_MIDIENCODER_HPP -#define BOO_MIDIENCODER_HPP +#pragma once #include "boo/audiodev/IMIDIReader.hpp" #include "boo/audiodev/IMIDIPort.hpp" @@ -47,4 +46,3 @@ public: } -#endif // BOO_MIDIENCODER_HPP diff --git a/include/boo/boo.hpp b/include/boo/boo.hpp index 879e134..d25c6ee 100644 --- a/include/boo/boo.hpp +++ b/include/boo/boo.hpp @@ -1,5 +1,4 @@ -#ifndef BOO_HPP -#define BOO_HPP +#pragma once #include "IApplication.hpp" #include "IWindow.hpp" @@ -12,4 +11,3 @@ #include "graphicsdev/IGraphicsDataFactory.hpp" #include "DeferredWindowEvents.hpp" -#endif // BOO_HPP diff --git a/include/boo/graphicsdev/D3D.hpp b/include/boo/graphicsdev/D3D.hpp index b012b6f..5406d2d 100644 --- a/include/boo/graphicsdev/D3D.hpp +++ b/include/boo/graphicsdev/D3D.hpp @@ -1,5 +1,4 @@ -#ifndef GDEV_D3D_HPP -#define GDEV_D3D_HPP +#pragma once #if _WIN32 @@ -53,4 +52,3 @@ public: } #endif // _WIN32 -#endif // GDEV_D3D_HPP diff --git a/include/boo/graphicsdev/GL.hpp b/include/boo/graphicsdev/GL.hpp index 176e71b..822060a 100644 --- a/include/boo/graphicsdev/GL.hpp +++ b/include/boo/graphicsdev/GL.hpp @@ -1,5 +1,4 @@ -#ifndef GDEV_GL_HPP -#define GDEV_GL_HPP +#pragma once #if BOO_HAS_GL #include "IGraphicsDataFactory.hpp" @@ -68,4 +67,3 @@ public: } #endif -#endif // GDEV_GL_HPP diff --git a/include/boo/graphicsdev/GLSLMacros.hpp b/include/boo/graphicsdev/GLSLMacros.hpp index a4262a3..82e764d 100644 --- a/include/boo/graphicsdev/GLSLMacros.hpp +++ b/include/boo/graphicsdev/GLSLMacros.hpp @@ -1,5 +1,4 @@ -#ifndef GDEV_GLSLMACROS_HPP -#define GDEV_GLSLMACROS_HPP +#pragma once #define BOO_GLSL_MAX_UNIFORM_COUNT 8 #define BOO_GLSL_MAX_TEXTURE_COUNT 8 @@ -51,4 +50,3 @@ "#define TBINDING7\n" \ "#endif\n" -#endif // GDEV_GLSLMACROS_HPP diff --git a/include/boo/graphicsdev/IGraphicsCommandQueue.hpp b/include/boo/graphicsdev/IGraphicsCommandQueue.hpp index 56fd830..faede64 100644 --- a/include/boo/graphicsdev/IGraphicsCommandQueue.hpp +++ b/include/boo/graphicsdev/IGraphicsCommandQueue.hpp @@ -1,5 +1,4 @@ -#ifndef IGFXCOMMANDQUEUE_HPP -#define IGFXCOMMANDQUEUE_HPP +#pragma once #include "IGraphicsDataFactory.hpp" #include "boo/IWindow.hpp" @@ -43,4 +42,3 @@ struct IGraphicsCommandQueue } -#endif // IGFXCOMMANDQUEUE_HPP diff --git a/include/boo/graphicsdev/IGraphicsDataFactory.hpp b/include/boo/graphicsdev/IGraphicsDataFactory.hpp index e52c3a9..f282080 100644 --- a/include/boo/graphicsdev/IGraphicsDataFactory.hpp +++ b/include/boo/graphicsdev/IGraphicsDataFactory.hpp @@ -1,5 +1,4 @@ -#ifndef IGFXDATAFACTORY_HPP -#define IGFXDATAFACTORY_HPP +#pragma once #include #include @@ -358,4 +357,3 @@ using FactoryCommitFunc = std::function; } -#endif // IGFXDATAFACTORY_HPP diff --git a/include/boo/graphicsdev/Metal.hpp b/include/boo/graphicsdev/Metal.hpp index 2bff64f..fafdef5 100644 --- a/include/boo/graphicsdev/Metal.hpp +++ b/include/boo/graphicsdev/Metal.hpp @@ -1,5 +1,4 @@ -#ifndef GDEV_METAL_HPP -#define GDEV_METAL_HPP +#pragma once #ifdef __APPLE__ #if BOO_HAS_METAL @@ -83,4 +82,3 @@ public: #endif #endif // __APPLE__ -#endif // GDEV_METAL_HPP diff --git a/include/boo/graphicsdev/Vulkan.hpp b/include/boo/graphicsdev/Vulkan.hpp index c64536d..d3828b9 100644 --- a/include/boo/graphicsdev/Vulkan.hpp +++ b/include/boo/graphicsdev/Vulkan.hpp @@ -1,5 +1,4 @@ -#ifndef GDEV_VULKAN_HPP -#define GDEV_VULKAN_HPP +#pragma once #if BOO_HAS_VULKAN #include "IGraphicsDataFactory.hpp" @@ -184,4 +183,3 @@ public: } #endif -#endif // GDEV_VULKAN_HPP diff --git a/include/boo/graphicsdev/VulkanDispatchTable.hpp b/include/boo/graphicsdev/VulkanDispatchTable.hpp index 78ef317..7efa1e7 100644 --- a/include/boo/graphicsdev/VulkanDispatchTable.hpp +++ b/include/boo/graphicsdev/VulkanDispatchTable.hpp @@ -1,6 +1,5 @@ // This file is generated. -#ifndef HELPERSDISPATCHTABLE_H -#define HELPERSDISPATCHTABLE_H +#pragma once #include @@ -216,4 +215,3 @@ void init_dispatch_table_bottom(VkInstance instance, VkDevice dev); } // namespace vk -#endif // HELPERSDISPATCHTABLE_H diff --git a/include/boo/inputdev/CafeProPad.hpp b/include/boo/inputdev/CafeProPad.hpp index 6249cc1..c308531 100644 --- a/include/boo/inputdev/CafeProPad.hpp +++ b/include/boo/inputdev/CafeProPad.hpp @@ -1,9 +1,7 @@ -#ifndef CCAFEPROPAD_HPP -#define CCAFEPROPAD_HPP +#pragma once namespace boo { } -#endif // CCAFEPROPAD_HPP diff --git a/include/boo/inputdev/DeviceBase.hpp b/include/boo/inputdev/DeviceBase.hpp index 20919e3..d012b4a 100644 --- a/include/boo/inputdev/DeviceBase.hpp +++ b/include/boo/inputdev/DeviceBase.hpp @@ -1,5 +1,4 @@ -#ifndef CDEVICEBASE -#define CDEVICEBASE +#pragma once #include #include @@ -91,4 +90,3 @@ public: } -#endif // CDEVICEBASE diff --git a/include/boo/inputdev/DeviceFinder.hpp b/include/boo/inputdev/DeviceFinder.hpp index 2cb1153..990ff6a 100644 --- a/include/boo/inputdev/DeviceFinder.hpp +++ b/include/boo/inputdev/DeviceFinder.hpp @@ -1,5 +1,4 @@ -#ifndef CDEVICEFINDER_HPP -#define CDEVICEFINDER_HPP +#pragma once #include #include @@ -165,4 +164,3 @@ public: } -#endif // CDEVICEFINDER_HPP diff --git a/include/boo/inputdev/DeviceSignature.hpp b/include/boo/inputdev/DeviceSignature.hpp index c0f6e48..b3d1b88 100644 --- a/include/boo/inputdev/DeviceSignature.hpp +++ b/include/boo/inputdev/DeviceSignature.hpp @@ -1,5 +1,4 @@ -#ifndef SDeviceSignature_HPP -#define SDeviceSignature_HPP +#pragma once #include #include @@ -50,5 +49,4 @@ extern const DeviceSignature BOO_DEVICE_SIGS[]; } -#endif // SDeviceSignature_HPP diff --git a/include/boo/inputdev/DeviceToken.hpp b/include/boo/inputdev/DeviceToken.hpp index 5b5ba8b..dacb019 100644 --- a/include/boo/inputdev/DeviceToken.hpp +++ b/include/boo/inputdev/DeviceToken.hpp @@ -1,5 +1,4 @@ -#ifndef CDEVICETOKEN -#define CDEVICETOKEN +#pragma once #include #include "DeviceBase.hpp" @@ -77,4 +76,3 @@ public: } -#endif // CDEVICETOKEN diff --git a/include/boo/inputdev/DolphinSmashAdapter.hpp b/include/boo/inputdev/DolphinSmashAdapter.hpp index b5165e3..1b96645 100644 --- a/include/boo/inputdev/DolphinSmashAdapter.hpp +++ b/include/boo/inputdev/DolphinSmashAdapter.hpp @@ -1,5 +1,4 @@ -#ifndef CDOLPHINSMASHADAPTER_HPP -#define CDOLPHINSMASHADAPTER_HPP +#pragma once #include #include "DeviceBase.hpp" @@ -90,4 +89,3 @@ public: } -#endif // CDOLPHINSMASHADAPTER_HPP diff --git a/include/boo/inputdev/DualshockPad.hpp b/include/boo/inputdev/DualshockPad.hpp index 01d39bd..fdbb690 100644 --- a/include/boo/inputdev/DualshockPad.hpp +++ b/include/boo/inputdev/DualshockPad.hpp @@ -1,5 +1,4 @@ -#ifndef CDUALSHOCKPAD_HPP -#define CDUALSHOCKPAD_HPP +#pragma once #include #include #include "DeviceBase.hpp" @@ -183,4 +182,3 @@ public: } -#endif // CDUALSHOCKPAD_HPP diff --git a/include/boo/inputdev/GenericPad.hpp b/include/boo/inputdev/GenericPad.hpp index 852279e..f89cda7 100644 --- a/include/boo/inputdev/GenericPad.hpp +++ b/include/boo/inputdev/GenericPad.hpp @@ -1,5 +1,4 @@ -#ifndef CGENERICPAD_HPP -#define CGENERICPAD_HPP +#pragma once #include "DeviceBase.hpp" #include "HIDParser.hpp" @@ -32,4 +31,3 @@ public: } -#endif // CGENERICPAD_HPP diff --git a/include/boo/inputdev/HIDParser.hpp b/include/boo/inputdev/HIDParser.hpp index 9aeb28d..7a5cf8d 100644 --- a/include/boo/inputdev/HIDParser.hpp +++ b/include/boo/inputdev/HIDParser.hpp @@ -1,5 +1,4 @@ -#ifndef HIDPARSER_HPP -#define HIDPARSER_HPP +#pragma once #include "boo/System.hpp" #include @@ -219,4 +218,3 @@ public: } -#endif // HIDPARSER_HPP diff --git a/include/boo/inputdev/IHIDListener.hpp b/include/boo/inputdev/IHIDListener.hpp index bb5ca2f..89f04fb 100644 --- a/include/boo/inputdev/IHIDListener.hpp +++ b/include/boo/inputdev/IHIDListener.hpp @@ -1,5 +1,4 @@ -#ifndef IHIDLISTENER_HPP -#define IHIDLISTENER_HPP +#pragma once #include #include @@ -37,4 +36,3 @@ std::unique_ptr IHIDListenerNew(DeviceFinder& finder); } -#endif // IHIDLISTENER_HPP diff --git a/include/boo/inputdev/NintendoPowerA.hpp b/include/boo/inputdev/NintendoPowerA.hpp index 83ca8ae..b4fc23c 100644 --- a/include/boo/inputdev/NintendoPowerA.hpp +++ b/include/boo/inputdev/NintendoPowerA.hpp @@ -1,5 +1,4 @@ -#ifndef NINTENDOPOWERA_HPP -#define NINTENDOPOWERA_HPP +#pragma once #include "DeviceBase.hpp" #include "boo/System.hpp" @@ -51,4 +50,3 @@ public: }; } -#endif // NINTENDOPWERA_HPP diff --git a/include/boo/inputdev/RevolutionPad.hpp b/include/boo/inputdev/RevolutionPad.hpp index 91f1e5e..c308531 100644 --- a/include/boo/inputdev/RevolutionPad.hpp +++ b/include/boo/inputdev/RevolutionPad.hpp @@ -1,9 +1,7 @@ -#ifndef CREVOLUTIONPAD_HPP -#define CREVOLUTIONPAD_HPP +#pragma once namespace boo { } -#endif // CREVOLUTIONPAD_HPP diff --git a/include/boo/inputdev/XInputPad.hpp b/include/boo/inputdev/XInputPad.hpp index b22ad49..c9a70c4 100644 --- a/include/boo/inputdev/XInputPad.hpp +++ b/include/boo/inputdev/XInputPad.hpp @@ -1,5 +1,4 @@ -#ifndef XINPUTPAD_HPP -#define XINPUTPAD_HPP +#pragma once #include "DeviceBase.hpp" #include "DeviceSignature.hpp" @@ -65,4 +64,3 @@ public: } -#endif // XINPUTPAD_HPP diff --git a/lib/CFPointer.hpp b/lib/CFPointer.hpp index 0a8b7aa..4e429f6 100644 --- a/lib/CFPointer.hpp +++ b/lib/CFPointer.hpp @@ -1,5 +1,4 @@ -#ifndef __CFPOINTER_HPP__ -#define __CFPOINTER_HPP__ +#pragma once #include #include @@ -154,4 +153,3 @@ private: } }; -#endif // __CFPOINTER_HPP__ diff --git a/lib/Common.hpp b/lib/Common.hpp index 7115c82..5cc3e2c 100644 --- a/lib/Common.hpp +++ b/lib/Common.hpp @@ -1,5 +1,4 @@ -#ifndef BOO_INTERNAL_COMMON_HPP -#define BOO_INTERNAL_COMMON_HPP +#pragma once #include "boo/BooObject.hpp" #include @@ -78,4 +77,3 @@ static inline uint32_t flp2(uint32_t x) } -#endif // BOO_INTERNAL_COMMON_HPP diff --git a/lib/audiodev/AudioMatrix.hpp b/lib/audiodev/AudioMatrix.hpp index 30eff94..c65a386 100644 --- a/lib/audiodev/AudioMatrix.hpp +++ b/lib/audiodev/AudioMatrix.hpp @@ -1,5 +1,4 @@ -#ifndef BOO_AUDIOMATRIX_HPP -#define BOO_AUDIOMATRIX_HPP +#pragma once #include "boo/audiodev/IAudioVoice.hpp" #include @@ -163,4 +162,3 @@ public: } -#endif // BOO_AUDIOMATRIX_HPP diff --git a/lib/audiodev/AudioSubmix.hpp b/lib/audiodev/AudioSubmix.hpp index 00518b1..a479524 100644 --- a/lib/audiodev/AudioSubmix.hpp +++ b/lib/audiodev/AudioSubmix.hpp @@ -1,5 +1,4 @@ -#ifndef BOO_AUDIOSUBMIX_HPP -#define BOO_AUDIOSUBMIX_HPP +#pragma once #include "boo/audiodev/IAudioSubmix.hpp" #include @@ -101,4 +100,3 @@ template <> inline float*& AudioSubmix::_getRedirect() { return m_redirec } -#endif // BOO_AUDIOSUBMIX_HPP diff --git a/lib/audiodev/AudioVoice.hpp b/lib/audiodev/AudioVoice.hpp index 40fdbfe..187b405 100644 --- a/lib/audiodev/AudioVoice.hpp +++ b/lib/audiodev/AudioVoice.hpp @@ -1,5 +1,4 @@ -#ifndef BOO_AUDIOVOICE_HPP -#define BOO_AUDIOVOICE_HPP +#pragma once #include #include @@ -131,4 +130,3 @@ public: } -#endif // BOO_AUDIOVOICE_HPP diff --git a/lib/audiodev/AudioVoiceEngine.hpp b/lib/audiodev/AudioVoiceEngine.hpp index 07b72df..bb43761 100644 --- a/lib/audiodev/AudioVoiceEngine.hpp +++ b/lib/audiodev/AudioVoiceEngine.hpp @@ -1,5 +1,4 @@ -#ifndef BOO_AUDIOVOICEENGINE_HPP -#define BOO_AUDIOVOICEENGINE_HPP +#pragma once #include "boo/audiodev/IAudioVoiceEngine.hpp" #include "LtRtProcessing.hpp" @@ -93,4 +92,3 @@ template <> inline std::vector& BaseAudioVoiceEngine::_getLtRtIn() } -#endif // BOO_AUDIOVOICEENGINE_HPP diff --git a/lib/audiodev/Common.hpp b/lib/audiodev/Common.hpp index ad2519b..8024945 100644 --- a/lib/audiodev/Common.hpp +++ b/lib/audiodev/Common.hpp @@ -1,5 +1,4 @@ -#ifndef BOO_AUDIOCOMMON_HPP -#define BOO_AUDIOCOMMON_HPP +#pragma once #include #include "../Common.hpp" @@ -21,4 +20,3 @@ struct AudioVoiceEngineMixInfo } -#endif // BOO_AUDIOCOMMON_HPP diff --git a/lib/audiodev/LinuxMidi.hpp b/lib/audiodev/LinuxMidi.hpp index 9dff328..02aae3b 100644 --- a/lib/audiodev/LinuxMidi.hpp +++ b/lib/audiodev/LinuxMidi.hpp @@ -1,5 +1,4 @@ -#ifndef BOO_LINUXMIDI_HPP -#define BOO_LINUXMIDI_HPP +#pragma once #include "AudioVoiceEngine.hpp" #include "logvisor/logvisor.hpp" @@ -309,4 +308,3 @@ struct LinuxMidi : BaseAudioVoiceEngine } -#endif // BOO_LINUXMIDI_HPP diff --git a/lib/audiodev/LtRtProcessing.hpp b/lib/audiodev/LtRtProcessing.hpp index 553ed81..564d38d 100644 --- a/lib/audiodev/LtRtProcessing.hpp +++ b/lib/audiodev/LtRtProcessing.hpp @@ -1,5 +1,4 @@ -#ifndef BOO_LTRTPROCESSING_HPP -#define BOO_LTRTPROCESSING_HPP +#pragma once #include "boo/System.hpp" #include "boo/audiodev/IAudioVoice.hpp" @@ -80,4 +79,3 @@ public: } -#endif // BOO_LTRTPROCESSING_HPP diff --git a/lib/audiodev/MIDICommon.hpp b/lib/audiodev/MIDICommon.hpp index fe17ed9..66e1222 100644 --- a/lib/audiodev/MIDICommon.hpp +++ b/lib/audiodev/MIDICommon.hpp @@ -1,5 +1,4 @@ -#ifndef BOO_MIDICOMMON_HPP -#define BOO_MIDICOMMON_HPP +#pragma once namespace boo { @@ -29,4 +28,3 @@ enum class Status } -#endif // BOO_MIDICOMMON_HPP diff --git a/lib/graphicsdev/Common.hpp b/lib/graphicsdev/Common.hpp index 477eeda..a16e3b3 100644 --- a/lib/graphicsdev/Common.hpp +++ b/lib/graphicsdev/Common.hpp @@ -1,5 +1,4 @@ -#ifndef BOO_GRAPHICSDEV_COMMON_HPP -#define BOO_GRAPHICSDEV_COMMON_HPP +#pragma once /* Private header for managing shader data * binding lifetimes through rendering cycle */ @@ -163,4 +162,3 @@ void UpdateGammaLUT(ITextureD* tex, float gamma); } -#endif // BOO_GRAPHICSDEV_COMMON_HPP diff --git a/lib/inputdev/IHIDDevice.hpp b/lib/inputdev/IHIDDevice.hpp index 153a292..843c523 100644 --- a/lib/inputdev/IHIDDevice.hpp +++ b/lib/inputdev/IHIDDevice.hpp @@ -1,5 +1,4 @@ -#ifndef IHIDDEVICE_HPP -#define IHIDDEVICE_HPP +#pragma once #include "boo/inputdev/DeviceToken.hpp" #include "boo/inputdev/DeviceBase.hpp" @@ -35,4 +34,3 @@ public: } -#endif // IHIDDEVICE_HPP diff --git a/lib/inputdev/IOKitPointer.hpp b/lib/inputdev/IOKitPointer.hpp index 144b28f..9eb8a64 100644 --- a/lib/inputdev/IOKitPointer.hpp +++ b/lib/inputdev/IOKitPointer.hpp @@ -1,5 +1,4 @@ -#ifndef __IOKITPOINTER_HPP__ -#define __IOKITPOINTER_HPP__ +#pragma once #include "../CFPointer.hpp" #include @@ -118,4 +117,3 @@ private: } }; -#endif // __IOKITPOINTER_HPP__ diff --git a/lib/mac/CocoaCommon.hpp b/lib/mac/CocoaCommon.hpp index 9338f13..3ffc0d3 100644 --- a/lib/mac/CocoaCommon.hpp +++ b/lib/mac/CocoaCommon.hpp @@ -1,5 +1,4 @@ -#ifndef BOO_COCOACOMMON_HPP -#define BOO_COCOACOMMON_HPP +#pragma once #if __APPLE__ #if !__has_feature(objc_arc) @@ -42,4 +41,3 @@ namespace boo #endif #endif // __APPLE__ -#endif // BOO_COCOACOMMON_HPP diff --git a/lib/win/UWPCommon.hpp b/lib/win/UWPCommon.hpp index 90e54c7..7f33784 100644 --- a/lib/win/UWPCommon.hpp +++ b/lib/win/UWPCommon.hpp @@ -1,5 +1,4 @@ -#ifndef BOO_UWPCOMMON_HPP -#define BOO_UWPCOMMON_HPP +#pragma once #include "WinCommon.hpp" @@ -84,4 +83,3 @@ struct Boo3DAppContextUWP : Boo3DAppContext } }; -#endif // BOO_UWPCOMMON_HPP diff --git a/lib/win/Win32Common.hpp b/lib/win/Win32Common.hpp index 57ab0f0..371e860 100644 --- a/lib/win/Win32Common.hpp +++ b/lib/win/Win32Common.hpp @@ -1,5 +1,4 @@ -#ifndef BOO_WIN32COMMON_HPP -#define BOO_WIN32COMMON_HPP +#pragma once #ifndef _CRT_SECURE_NO_WARNINGS #define _CRT_SECURE_NO_WARNINGS 1 /* STFU MSVC */ @@ -168,4 +167,3 @@ namespace boo extern Win32Cursors WIN32_CURSORS; } -#endif // BOO_WIN32COMMON_HPP diff --git a/lib/win/WinCommon.hpp b/lib/win/WinCommon.hpp index ad4dc07..cd96b3d 100644 --- a/lib/win/WinCommon.hpp +++ b/lib/win/WinCommon.hpp @@ -1,5 +1,4 @@ -#ifndef BOO_WINCOMMON_HPP -#define BOO_WINCOMMON_HPP +#pragma once #include #include "boo/IWindow.hpp" @@ -133,4 +132,3 @@ static inline std::wstring MBSTWCS(const char* str) return strTo; } -#endif // BOO_WINCOMMON_HPP diff --git a/lib/x11/XlibCommon.hpp b/lib/x11/XlibCommon.hpp index d046694..198ef40 100644 --- a/lib/x11/XlibCommon.hpp +++ b/lib/x11/XlibCommon.hpp @@ -1,5 +1,4 @@ -#ifndef BOO_XLIBCOMMON_HPP -#define BOO_XLIBCOMMON_HPP +#pragma once #include @@ -19,4 +18,3 @@ extern XlibCursors X_CURSORS; } -#endif // BOO_XLIBCOMMON_HPP diff --git a/logvisor b/logvisor index 22ed01f..1b6c2ae 160000 --- a/logvisor +++ b/logvisor @@ -1 +1 @@ -Subproject commit 22ed01ffc5e5944479ed69d7b45dc8c96465063e +Subproject commit 1b6c2ae7159fd4fd7a80b1951d5ed43e4d1a3676