build: use #pragma once instead of header guards because 1) fuck the dinosaurs,

and 2) fuck the Visual Studio compiler that crashes when confused.

demos/test/btphystest.h

@@ -5,8 +5,7 @@
 //            (c) 2012 Sam Hocevar <sam@hocevar.net>
 //
 
-#if !defined __BTPHYSTEST_H__
-#define __BTPHYSTEST_H__
+#pragma once
 
 class CatShaderData : public GpuShaderData
 {
@@ -82,5 +81,3 @@ private:
     float                           m_loc_dp;
 };
 
-#endif // __BTPHYSTEST_H__
-

demos/test/nacl_phystest.h

@@ -5,8 +5,7 @@
 //            (c) 2012 Sam Hocevar <sam@hocevar.net>
 //
 
-#if !defined __BTPHYSTEST_H__
-#define __BTPHYSTEST_H__
+#pragma once
 
 class Nacl_PhysTest : public WorldEntity
 {
@@ -57,5 +56,3 @@ private:
     float                           m_loc_dp;
 };
 
-#endif // __BTPHYSTEST_H__
-

demos/test/physicobject.h

@@ -6,12 +6,12 @@
 //            (c) 2012 Sam Hocevar <sam@hocevar.net>
 //
 
-/* FIXME: this file is pure crap; it's only a test. */
+#pragma once
 
-#if !defined __PHYSICOBJECT_H__
-#define __PHYSICOBJECT_H__
+/* FIXME: this file is pure crap; it's only a test. */
 
 #include <lol/engine.h>
+
 #include "easymesh/easymesh.h"
 #include "physics/easyphysics.h"
 #include "physics/easycharactercontroller.h"
@@ -354,5 +354,3 @@ private:
     bool m_is_phys; /* Only used in CAT_MODE */
 };
 
-#endif /* __PHYSICOBJECT_H__ */
-

demos/test/physics/easycharactercontroller.h

@@ -9,6 +9,8 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The EasyCharacterController class
 // ------------------
@@ -17,9 +19,6 @@
 //Should try to to make a btKinematicCharacterController for real.
 //
 
-#if !defined __EASYCHARACTERCONTROLLER_EASYCHARACTERCONTROLLER_H__
-#define __EASYCHARACTERCONTROLLER_EASYCHARACTERCONTROLLER_H__
-
 #include <lol/engine.h>
 #include "easyphysics.h"
 #include "bulletcharactercontroller.h"
@@ -103,5 +102,3 @@ protected:
 
 } /* namespace lol */
 
-#endif /* __EASYCHARACTERCONTROLLER_EASYCHARACTERCONTROLLER_H__ */
-

demos/test/physics/easyconstraint.h

@@ -9,15 +9,15 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The EasyPhysic class
 // ------------------
 //
 
-#if !defined __EASYCONSTRAINT_EASYCONSTRAINT_H__
-#define __EASYCONSTRAINT_EASYCONSTRAINT_H__
-
 #include <lol/engine.h>
+
 #include "easyphysics.h"
 
 namespace lol
@@ -180,5 +180,3 @@ private:
 
 } /* namespace lol */
 
-#endif /* __EASYCONSTRAINT_EASYCONSTRAINT_H__ */
-

demos/test/physics/easyphysics.h

@@ -9,15 +9,15 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The EasyPhysic class
 // ------------------
 //
 
-#if !defined __EASYPHYSICS_EASYPHYSICS_H__
-#define __EASYPHYSICS_EASYPHYSICS_H__
-
 #include <lol/engine.h>
+
 #include <bullet/btBulletDynamicsCommon.h>
 #include <bullet/btBulletCollisionCommon.h>
 #include <bullet/BulletCollision/CollisionDispatch/btGhostObject.h>
@@ -155,5 +155,3 @@ protected:
 
 } /* namespace lol */
 
-#endif /* __EASYPHYSICS_EASYPHYSICS_H__ */
-

demos/test/physics/lolbtphysicsintegration.h

@@ -9,14 +9,13 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // Bullet Physics integration in Lol
 // ------------------
 //
 
-#if !defined __LOLBTPHYSICSINTEGRATION_H__
-#define __LOLBTPHYSICSINTEGRATION_H__
-
 namespace lol
 {
     //Override Gamegroups names for Physic-usage
@@ -46,5 +45,3 @@ namespace lol
 
 } /* namespace lol */
 
-#endif /* __LOLBTPHYSICSINTEGRATION_H__ */
-

demos/test/physics/lolphysics.h

@@ -5,10 +5,10 @@
 //            (c) 2012 Sam Hocevar <sam@hocevar.net>
 //
 
-#if !defined __LOLPHYSICS_H__
-#define __LOLPHYSICS_H__
+#pragma once
 
 #include <cstring>
+
 #include <bullet/btBulletDynamicsCommon.h>
 #include <bullet/btBulletCollisionCommon.h>
 #include <BulletDynamics/Character/btKinematicCharacterController.h>
@@ -430,5 +430,3 @@ private:
 
 } /* namespace lol */
 
-#endif // __LOLPHYSICS_H__
-

demos/test/scenesetup-compiler.h

@@ -9,8 +9,7 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
-#ifndef __SCENESETUP_COMPILER_H__
-#define __SCENESETUP_COMPILER_H__
+#pragma once
 
 #include <string>
 
@@ -59,5 +58,3 @@ public:
 
 } /* namespace lol */
 
-#endif /* __SCENESETUP_COMPILER_H__ */
-

demos/test/scenesetup.h

@@ -9,14 +9,13 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The Scene setup class
 // ----------------
 //
 
-#if !defined __SCENESETUP_H__
-#define __SCENESETUP_H__
-
 namespace lol
 {
 
@@ -48,4 +47,3 @@ public:
 
 } /* namespace lol */
 
-#endif /* __SCENESETUP_H__ */

src/application/application.h

@@ -8,14 +8,13 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The Application class
 // ---------------------
 //
 
-#if !defined __LOL_APPLICATION_H__
-#define __LOL_APPLICATION_H__
-
 namespace lol
 {
 
@@ -39,5 +38,3 @@ private:
 
 } /* namespace lol */
 
-#endif // __LOL_APPLICATION_H__
-

src/audio.h

@@ -8,15 +8,14 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The Audio interface
 // -------------------
 // Helper functions to set up the audio device.
 //
 
-#if !defined __LOL_AUDIO_H__
-#define __LOL_AUDIO_H__
-
 #include <stdint.h>
 
 namespace lol
@@ -36,5 +35,3 @@ private:
 
 } /* namespace lol */
 
-#endif // __LOL_AUDIO_H__
-

src/camera.h

@@ -8,13 +8,14 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The Camera class
 // ----------------
 //
 
-#if !defined __CAMERA_H__
-#define __CAMERA_H__
+#include <lol/math/matrix.h>
 
 #include "worldentity.h"
 
@@ -105,4 +106,3 @@ public:
 
 } /* namespace lol */
 
-#endif /* __CAMERA_H__ */

src/commandstack.h

@@ -9,14 +9,13 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The CommandStack struct
 // ------------------
 //
 
-#if !defined __COMMANDSTACK_COMMANDSTACK_H__
-#define __COMMANDSTACK_COMMANDSTACK_H__
-
 namespace lol
 {
 
@@ -87,4 +86,3 @@ public:
 
 } /* namespace lol */
 
-#endif /* __COMMANDSTACK_COMMANDSTACK_H__ */

src/debug/fps.h

@@ -8,14 +8,13 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The DebugFps class
 // ------------------
 //
 
-#if !defined __LOL_DEBUGFPS_H__
-#define __LOL_DEBUGFPS_H__
-
 #include "entity.h"
 
 namespace lol
@@ -38,5 +37,3 @@ private:
 
 } /* namespace lol */
 
-#endif // __LOL_DEBUGFPS_H__
-

src/debug/record.h

@@ -8,14 +8,13 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The DebugRecord class
 // ---------------------
 //
 
-#if !defined __LOL_DEBUGRECORD_H__
-#define __LOL_DEBUGRECORD_H__
-
 #include "entity.h"
 
 namespace lol
@@ -39,5 +38,3 @@ private:
 
 } /* namespace lol */
 
-#endif // __LOL_DEBUGRECORD_H__
-

src/debug/stats.h

@@ -8,14 +8,13 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The DebugStats class
 // --------------------
 //
 
-#if !defined __LOL_DEBUGSTATS_H__
-#define __LOL_DEBUGSTATS_H__
-
 #include "entity.h"
 
 namespace lol
@@ -38,5 +37,3 @@ private:
 
 } /* namespace lol */
 
-#endif // __LOL_DEBUGSTATS_H__
-

src/dict.h

@@ -8,14 +8,13 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The Dict class
 // --------------
 //
 
-#if !defined __LOL_DICT_H__
-#define __LOL_DICT_H__
-
 #include "entity.h"
 
 namespace lol
@@ -42,5 +41,3 @@ private:
 
 } /* namespace lol */
 
-#endif // __LOL_DICT_H__
-

src/easymesh/csgbsp.h

@@ -9,14 +9,13 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The EasyMesh class
 // ------------------
 //
 
-#if !defined __CSGBSP_CSGBSP_H__
-#define __CSGBSP_CSGBSP_H__
-
 namespace lol
 {
 
@@ -74,5 +73,3 @@ private:
 
 } /* namespace lol */
 
-#endif /* __CSGBSP_CSGBSP_H__ */
-

src/easymesh/easymesh-compiler.h

@@ -10,8 +10,7 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
-#ifndef __EASYMESH_COMPILER_H__
-#define __EASYMESH_COMPILER_H__
+#pragma once
 
 #include <string>
 
@@ -57,5 +56,3 @@ public:
 
 } /* namespace lol */
 
-#endif /* __EASYMESH_COMPILER_H__ */
-

src/easymesh/easymesh.h

@@ -10,6 +10,8 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The EasyMesh class
 // ------------------
@@ -19,9 +21,6 @@
 #include "easymeshrender.h"
 #include "easymeshbuild.h"
 
-#if !defined __EASYMESH_EASYMESH_H__
-#define __EASYMESH_EASYMESH_H__
-
 namespace lol
 {
 
@@ -399,5 +398,3 @@ private:
 
 } /* namespace lol */
 
-#endif /* __EASYMESH_EASYMESH_H__ */
-

src/easymesh/easymeshbuild.h

@@ -10,14 +10,13 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The EasyMesh class
 // ------------------
 //
 
-#if !defined __EASYMESHBUILD_EASYMESHBUILD_H__
-#define __EASYMESHBUILD_EASYMESHBUILD_H__
-
 namespace lol
 {
 
@@ -409,5 +408,3 @@ private:
 
 } /* namespace lol */
 
-#endif /* __EASYMESHBUILD_EASYMESHBUILD_H__ */
-

src/easymesh/easymeshrender.h

@@ -10,14 +10,13 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The EasyMesh class
 // ------------------
 //
 
-#if !defined __EASYMESHRENDER_EASYMESHRENDER_H__
-#define __EASYMESHRENDER_EASYMESHRENDER_H__
-
 namespace lol
 {
 
@@ -127,5 +126,3 @@ private:
 
 } /* namespace lol */
 
-#endif /* __EASYMESHRENDER_EASYMESHRENDER_H__ */
-

src/eglapp.h

@@ -8,14 +8,13 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The EglApp class
 // ----------------
 //
 
-#if !defined __LOL_EGLAPP_H__
-#define __LOL_EGLAPP_H__
-
 #include "lol/math/vector.h"
 
 namespace lol
@@ -38,5 +37,3 @@ private:
 
 } /* namespace lol */
 
-#endif // __LOL_EGLAPP_H__
-

src/emitter.h

@@ -8,14 +8,13 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The Emitter class
 // -----------------
 //
 
-#if !defined __LOL_EMITTER_H__
-#define __LOL_EMITTER_H__
-
 #include "entity.h"
 #include "tileset.h"
 
@@ -42,5 +41,3 @@ private:
 
 } /* namespace lol */
 
-#endif // __LOL_EMITTER_H__
-

src/entity.h

@@ -8,6 +8,8 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The Entity class
 // ---------------
@@ -16,9 +18,6 @@
 // Ticker class for the ticking logic and the linked list implementation.
 //
 
-#if !defined __LOL_ENTITY_H__
-#define __LOL_ENTITY_H__
-
 #include <stdint.h>
 
 namespace lol
@@ -130,5 +129,3 @@ private:
 
 } /* namespace lol */
 
-#endif // __LOL_ENTITY_H__
-

src/font.h

@@ -8,14 +8,13 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The Font class
 // --------------
 //
 
-#if !defined __LOL_FONT_H__
-#define __LOL_FONT_H__
-
 #include "entity.h"
 
 namespace lol
@@ -45,5 +44,3 @@ private:
 
 } /* namespace lol */
 
-#endif // __LOL_FONT_H__
-

src/forge.h

@@ -8,15 +8,14 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The Forge class
 // ---------------
 // The Forge is a static class that manages fonts.
 //
 
-#if !defined __LOL_FORGE_H__
-#define __LOL_FORGE_H__
-
 #include "font.h"
 
 namespace lol
@@ -35,5 +34,3 @@ private:
 
 } /* namespace lol */
 
-#endif // __LOL_FORGE_H__
-

src/gpu/lolfx-compiler.h

@@ -8,8 +8,7 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
-#ifndef __LOLFX_COMPILER_H__
-#define __LOLFX_COMPILER_H__
+#pragma once
 
 #include <string>
 
@@ -67,5 +66,3 @@ public:
 
 } /* namespace lol */
 
-#endif /* __LOLFX_COMPILER_H__ */
-

src/gradient.h

@@ -8,14 +8,13 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The Gradient class
 // ------------------
 //
 
-#if !defined __LOL_GRADIENT_H__
-#define __LOL_GRADIENT_H__
-
 #include "worldentity.h"
 
 namespace lol
@@ -41,5 +40,3 @@ private:
 
 } /* namespace lol */
 
-#endif // __LOL_GRADIENT_H__
-

src/image/image-private.h

@@ -8,14 +8,13 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The ImageCodecData class
 // ------------------------
 //
 
-#if !defined __LOL_IMAGE_PRIVATE_H__
-#define __LOL_IMAGE_PRIVATE_H__
-
 namespace lol
 {
 
@@ -101,5 +100,3 @@ public:
 
 } /* namespace lol */
 
-#endif // __LOL_IMAGE_PRIVATE_H__
-

src/input/controller.h

@@ -8,8 +8,7 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
-#if !defined __LOL_INPUT_CONTROLLER_H__
-#define __LOL_INPUT_CONTROLLER_H__
+#pragma once
 
 namespace lol
 {
@@ -154,5 +153,3 @@ private:
 
 } /* namespace lol */
 
-#endif // __LOL_INPUT_CONTROLLER_H__
-

src/input/input.h

@@ -8,8 +8,7 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
-#if !defined __LOL_INPUT_H__
-#define __LOL_INPUT_H__
+#pragma once
 
 namespace lol
 {
@@ -121,5 +120,3 @@ private:
 
 } /* namespace lol */
 
-#endif // __LOL_INPUT_H__
-

src/input/input_internal.h

@@ -8,8 +8,7 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
-#if !defined __LOL_INPUT_DEVICE_INTERNAL_H__
-#define __LOL_INPUT_DEVICE_H__
+#pragma once
 
 namespace lol
 {
@@ -37,5 +36,3 @@ public:
 
 } /* namespace lol */
 
-#endif // __LOL_INPUT_DEVICE_INTERNAL_H__
-

src/light.h

@@ -8,14 +8,13 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The Light class
 // ---------------
 //
 
-#if !defined __LIGHT_H__
-#define __LIGHT_H__
-
 #include <cfloat> /* for FLT_MAX */
 
 #include "worldentity.h"
@@ -99,5 +98,3 @@ private:
 
 } /* namespace lol */
 
-#endif /* __LIGHT_H__ */
-

src/lol/algorithm/aabb_tree.h

@@ -9,8 +9,7 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
-#if !defined __LOL_AABB_TREE_H__
-#define __LOL_AABB_TREE_H__
+#pragma once
 
 #include <lol/base/array.h>
 #include <lol/debug/lines.h>
@@ -399,5 +398,3 @@ protected:
 
 } /* namespace lol */
 
-#endif // __LOL_AABB_TREE_H__
-

src/lol/algorithm/all.h

@@ -8,12 +8,9 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
-#if !defined __LOL_ALGORITHM_ALL_H__
-#define __LOL_ALGORITHM_ALL_H__
+#pragma once
 
 #include <lol/algorithm/sort.h>
 #include <lol/algorithm/aabb_tree.h>
 #include <lol/algorithm/portal.h>
 
-#endif // __LOL_ALGORITHM_ALL_H__
-

src/lol/algorithm/portal.h

@@ -9,8 +9,7 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
-#if !defined __LOL_PORTAL_H__
-#define __LOL_PORTAL_H__
+#pragma once
 
 #include <cfloat> /* for FLT_MAX */
 
@@ -387,5 +386,3 @@ private:
 
 } /* namespace lol */
 
-#endif // __LOL_PORTAL_H__
-

src/lol/algorithm/sort.h

@@ -9,8 +9,7 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
-#if !defined __LOL_ALGORITHM_SORT_H__
-#define __LOL_ALGORITHM_SORT_H__
+#pragma once
 
 #include <lol/base/array.h>
 
@@ -97,5 +96,3 @@ void array_base<T, ARRAY>::SortQuickSwap(ptrdiff_t start, ptrdiff_t stop)
 
 } /* namespace lol */
 
-#endif // __LOL_ALGORITHM_SORT_H__
-

src/lol/base/all.h

@@ -8,8 +8,7 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
-#if !defined __LOL_BASE_ALL_H__
-#define __LOL_BASE_ALL_H__
+#pragma once
 
 #include <lol/base/features.h>
 #include <lol/base/types.h>
@@ -22,5 +21,3 @@
 #include <lol/base/map.h>
 #include <lol/base/enum.h>
 
-#endif // __LOL_BASE_ALL_H__
-

src/lol/base/array.h

@@ -9,6 +9,8 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The array class
 // ---------------
@@ -16,10 +18,8 @@
 // additional features, eg. array<int,float> for automatic arrays of tuples.
 //
 
-#if !defined __LOL_BASE_ARRAY_H__
-#define __LOL_BASE_ARRAY_H__
-
 #include <lol/base/assert.h>
+#include <lol/base/tuple.h>
 
 #include <new> /* for placement new */
 #include <algorithm> /* for std::swap */
@@ -543,5 +543,3 @@ template<typename... T> using Array = array<T...>;
 
 } /* namespace lol */
 
-#endif // __LOL_BASE_ARRAY_H__
-

src/lol/base/assert.h

@@ -8,8 +8,9 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
-#if !defined __LOL_BASE_ASSERT_H__
-#define __LOL_BASE_ASSERT_H__
+#pragma once
+
+#include <lol/base/log.h>
 
 #include <cstdlib>
 
@@ -139,5 +140,3 @@ static inline void DebugAbort()
 
 } /* namespace lol */
 
-#endif // __LOL_BASE_ASSERT_H__
-

src/lol/base/enum.h

@@ -8,8 +8,9 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
-#if !defined __LOL_BASE_ENUM_H__
-#define __LOL_BASE_ENUM_H__
+#pragma once
+
+#include <lol/base/map.h>
 
 namespace lol
 {
@@ -163,5 +164,3 @@ public:
 
 } /* namespace lol */
 
-#endif // __LOL_BASE_ENUM_H__
-

src/lol/base/features.h

@@ -8,14 +8,13 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The build-time features
 // -----------------------
 //
 
-#if !defined __LOL_BASE_FEATURES_H__
-#define __LOL_BASE_FEATURES_H__
-
 /*
  * System, CPU and compiler features.
  */
@@ -146,6 +145,3 @@ static inline int isnan(float f)
 #undef None
 #define None None
 
-
-#endif // __LOL_BASE_FEATURES_H__
-

src/lol/base/hash.h

@@ -8,15 +8,14 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The hash class
 // --------------
 // A very simple hash class.
 //
 
-#if !defined __LOL_BASE_HASH_H__
-#define __LOL_BASE_HASH_H__
-
 namespace lol
 {
 
@@ -50,5 +49,3 @@ template<> struct hash<String>
 
 } /* namespace lol */
 
-#endif // __LOL_BASE_HASH_H__
-

src/lol/base/log.h

@@ -8,15 +8,14 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The Log interface
 // -----------------
 // The central logging system.
 //
 
-#if !defined __LOL_BASE_LOG_H__
-#define __LOL_BASE_LOG_H__
-
 #include <stdint.h>
 #include <cstdarg>
 
@@ -51,5 +50,3 @@ private:
 
 } /* namespace lol */
 
-#endif // __LOL_BASE_LOG_H__
-

src/lol/base/map.h

@@ -8,14 +8,15 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The map class
 // -------------
 // A very simple map class.
 //
 
-#if !defined __LOL_BASE_MAP_H__
-#define __LOL_BASE_MAP_H__
+#include <lol/base/hash.h>
 
 namespace lol
 {
@@ -116,5 +117,3 @@ private:
 
 } /* namespace lol */
 
-#endif // __LOL_BASE_MAP_H__
-

src/lol/base/string.h

@@ -8,15 +8,14 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The String class
 // ----------------
 // A very simple String class, based on Array.
 //
 
-#if !defined __LOL_BASE_STRING_H__
-#define __LOL_BASE_STRING_H__
-
 #include <lol/base/assert.h>
 #include <lol/base/array.h>
 
@@ -299,5 +298,3 @@ inline bool operator !=(char const* sz, String const &s)
 
 } /* namespace lol */
 
-#endif // __LOL_BASE_STRING_H__
-

src/lol/base/tuple.h

@@ -9,19 +9,18 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The tuple class
 // ---------------
 // A very simple tuple class.
 //
 
-#if !defined __LOL_BASE_TUPLE_H__
-#define __LOL_BASE_TUPLE_H__
+#include <lol/base/assert.h>
 
 #include <tuple>
 
-#include <lol/base/assert.h>
-
 namespace lol
 {
 
@@ -91,5 +90,3 @@ public:
 
 } /* namespace lol */
 
-#endif // __LOL_BASE_TUPLE_H__
-

src/lol/base/types.h

@@ -8,8 +8,7 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
-#if !defined __LOL_BASE_TYPES_H__
-#define __LOL_BASE_TYPES_H__
+#pragma once
 
 #include <stdint.h>
 
@@ -130,5 +129,3 @@ typedef imat4x3 int4x3;
 
 } /* namespace lol */
 
-#endif // __LOL_BASE_TYPES_H__
-

src/lol/debug/all.h

@@ -8,10 +8,7 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
-#if !defined __LOL_DEBUG_ALL_H__
-#define __LOL_DEBUG_ALL_H__
+#pragma once
 
 #include <lol/debug/lines.h>
 
-#endif // __LOL_DEBUG_ALL_H__
-

src/lol/debug/lines.h

@@ -8,14 +8,13 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // Debug line primitives
 // ---------------------
 //
 
-#if !defined __LOL_DEBUG_LINES_H__
-#define __LOL_DEBUG_LINES_H__
-
 #include <stdint.h>
 
 namespace lol
@@ -113,5 +112,3 @@ void DrawViewProj(mat4 view, mat4 proj, vec4 color);
 
 } /* namespace lol */
 
-#endif // __LOL_DEBUG_LINES_H__
-

src/lol/engine-internal.h

@@ -8,14 +8,13 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
-// The main header
-// ---------------
+// The main header (for internal engine use only)
+// ----------------------------------------------
 //
 
-#if !defined__LOL_ENGINE_INTERNAL_H__
-#define __LOL_ENGINE_INTERNAL_H__
-
 /* Include this as early as possible */
 #if HAVE_CONFIG_H
 #   include "config.h"
@@ -36,5 +35,3 @@
 #include <lol/public.h>
 #include <lol/extras.h>
 
-#endif // __LOL_ENGINE_INTERNAL_H__
-

src/lol/engine.h

@@ -8,14 +8,13 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
-// The main header
-// ---------------
+// The main header (for all applications)
+// --------------------------------------
 //
 
-#if !defined __LOL_ENGINE_H__
-#define __LOL_ENGINE_H__
-
 /* If using NaCl or Android, override main() with our version */
 #if __native_client__
 #   define main lol_nacl_main
@@ -31,5 +30,3 @@
 #include <lol/public.h>
 #include <lol/extras.h>
 
-#endif // __LOL_ENGINE_H__
-

src/lol/extras.h

@@ -8,14 +8,13 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // Extra includes that aren't proper part of the engine yet
 // --------------------------------------------------------
 //
 
-#if !defined __LOL_EXTRAS_H__
-#define __LOL_EXTRAS_H__
-
 #include <lol/../utils.h>
 #include <lol/../numeric.h>
 
@@ -60,5 +59,3 @@
 #include <lol/../tiler.h>
 #include <lol/../sampler.h>
 
-#endif // __LOL_EXTRAS_H__
-

src/lol/gpu/all.h

@@ -8,8 +8,7 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
-#if !defined __LOL_GPU_ALL_H__
-#define __LOL_GPU_ALL_H__
+#pragma once
 
 #include <lol/gpu/shader.h>
 #include <lol/gpu/indexbuffer.h>
@@ -20,5 +19,3 @@
 #include <lol/gpu/renderer.h>
 #include <lol/gpu/rendercontext.h>
 
-#endif // __LOL_GPU_ALL_H__
-

src/lol/gpu/framebuffer.h

@@ -8,14 +8,13 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The Framebuffer class
 // ---------------------
 //
 
-#if !defined __LOL_GPU_FRAMEBUFFER_H__
-#define __LOL_GPU_FRAMEBUFFER_H__
-
 #include <cstring>
 
 namespace lol
@@ -115,5 +114,3 @@ private:
 
 } /* namespace lol */
 
-#endif // __LOL_GPU_FRAMEBUFFER_H__
-

src/lol/gpu/indexbuffer.h

@@ -8,14 +8,13 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The IndexBuffer class
 // ---------------------
 //
 
-#if !defined __LOL_GPU_INDEXBUFFER_H__
-#define __LOL_GPU_INDEXBUFFER_H__
-
 #include <cstring>
 
 namespace lol
@@ -41,5 +40,3 @@ private:
 
 } /* namespace lol */
 
-#endif // __LOL_GPU_INDEXBUFFER_H__
-

src/lol/gpu/lolfx.h

@@ -8,14 +8,13 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The LolFx class
 // ---------------
 //
 
-#if !defined __LOL_GPU_LOLFX_H__
-#define __LOL_GPU_LOLFX_H__
-
 #include <lol/gpu/shader.h>
 
 namespace lol
@@ -44,5 +43,3 @@ private:
 
 } /* namespace lol */
 
-#endif /* __LOL_GPU_LOLFX_H__ */
-

src/lol/gpu/rendercontext.h

@@ -8,14 +8,13 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The RenderContext class
 // -----------------------
 //
 
-#if !defined __LOL_RENDERCONTEXT_H__
-#define __LOL_RENDERCONTEXT_H__
-
 namespace lol
 {
 
@@ -58,5 +57,3 @@ private:
 
 } /* namespace lol */
 
-#endif // __LOL_RENDERCONTEXT_H__
-

src/lol/gpu/renderer.h

@@ -8,14 +8,13 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The Renderer class
 // ------------------
 //
 
-#if !defined __LOL_RENDERER_H__
-#define __LOL_RENDERER_H__
-
 namespace lol
 {
 
@@ -182,5 +181,3 @@ extern Renderer *g_renderer;
 
 } /* namespace lol */
 
-#endif // __LOL_RENDERER_H__
-

src/lol/gpu/shader.h

@@ -8,16 +8,17 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The Shader class
 // ----------------
 //
 
-#if !defined __LOL_GPU_SHADER_H__
-#define __LOL_GPU_SHADER_H__
-
 #include <stdint.h>
 
+#include "entity.h"
+
 /* External declaration for LolFx files. */
 #define LOLFX_RESOURCE_DECLARE(name) \
     extern "C" char const *lolfx_resource_##name
@@ -138,5 +139,3 @@ private:
 
 } /* namespace lol */
 
-#endif // __LOL_GPU_SHADER_H__
-

src/lol/gpu/texture.h

@@ -8,13 +8,14 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The Texture class
 // -----------------
 //
 
-#if !defined __LOL_GPU_TEXTURE_H__
-#define __LOL_GPU_TEXTURE_H__
+#include <lol/gpu/shader.h>
 
 namespace lol
 {
@@ -75,5 +76,3 @@ private:
 
 } /* namespace lol */
 
-#endif // __LOL_GPU_TEXTURE_H__
-

src/lol/gpu/vertexbuffer.h

@@ -8,14 +8,13 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The VertexBuffer and VertexDeclaration classes
 // ----------------------------------------------
 //
 
-#if !defined __LOL_GPU_VERTEXBUFFER_H__
-#define __LOL_GPU_VERTEXBUFFER_H__
-
 #include <cstring>
 
 namespace lol
@@ -239,5 +238,3 @@ private:
 
 } /* namespace lol */
 
-#endif // __LOL_GPU_VERTEXBUFFER_H__
-

src/lol/image/all.h

@@ -8,12 +8,9 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
-#if !defined __LOL_IMAGE_ALL_H__
-#define __LOL_IMAGE_ALL_H__
+#pragma once
 
 #include <lol/image/pixel.h>
 #include <lol/image/color.h>
 #include <lol/image/image.h>
 
-#endif // __LOL_IMAGE_ALL_H__
-

src/lol/image/color.h

@@ -8,15 +8,14 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The Color class
 // ---------------
 // Provides various color conversion routines.
 //
 
-#if !defined __LOL_IMAGE_COLOR_H__
-#define __LOL_IMAGE_COLOR_H__
-
 #include <lol/math/vector.h>
 
 namespace lol
@@ -333,5 +332,3 @@ public:
 
 } /* namespace lol */
 
-#endif // __LOL_IMAGE_COLOR_H__
-

src/lol/image/image.h

@@ -8,15 +8,17 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The Image class
 // ---------------
 //
 
-#if !defined __LOL_IMAGE_IMAGE_H__
-#define __LOL_IMAGE_IMAGE_H__
-
+#include <lol/math/arraynd.h>
 #include <lol/math/vector.h>
+#include <lol/math/geometry.h>
+#include <lol/image/pixel.h>
 
 namespace lol
 {
@@ -162,5 +164,3 @@ private:
 
 } /* namespace lol */
 
-#endif // __LOL_IMAGE_IMAGE_H__
-

src/lol/image/pixel.h

@@ -8,14 +8,13 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The Pixel-related classes
 // -------------------------
 //
 
-#if !defined __LOL_IMAGE_PIXEL_H__
-#define __LOL_IMAGE_PIXEL_H__
-
 namespace lol
 {
 
@@ -73,5 +72,3 @@ static inline uint8_t BytesPerPixel(PixelFormat format)
 
 } /* namespace lol */
 
-#endif // __LOL_IMAGE_PIXEL_H__
-

src/lol/math/all.h

@@ -8,8 +8,7 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
-#if !defined __LOL_MATH_ALL_H__
-#define __LOL_MATH_ALL_H__
+#pragma once
 
 #include <lol/math/constants.h>
 #include <lol/math/functions.h>
@@ -24,5 +23,3 @@
 #include <lol/math/interp.h>
 #include <lol/math/rand.h>
 
-#endif // __LOL_MATH_ALL_H__
-

src/lol/math/arraynd.h

@@ -10,6 +10,8 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The arraynd class
 // -----------------
@@ -21,9 +23,6 @@
 // uses vec_t.
 //
 
-#if !defined __LOL_MATH_ARRAYND_H__
-#define __LOL_MATH_ARRAYND_H__
-
 #include <lol/base/array.h>
 #include <lol/base/assert.h>
 
@@ -278,5 +277,3 @@ template<typename... T> using array3d = arraynd<3, T...>;
 
 } /* namespace lol */
 
-#endif // __LOL_MATH_ARRAYND_H__
-

src/lol/math/constants.h

@@ -8,13 +8,14 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // Various maths constants
 // -----------------------
 //
 
-#if !defined __LOL_MATH_CONSTANTS_H__
-#define __LOL_MATH_CONSTANTS_H__
+#include <lol/base/types.h>
 
 namespace lol
 {
@@ -42,5 +43,3 @@ LOL_MATH_CONSTANT(SQRT_1_2, 0.70710678118654752440084436210484903928483593768L)
 
 } /* namespace lol */
 
-#endif // __LOL_MATH_CONSTANTS_H__
-

src/lol/math/functions.h

@@ -9,13 +9,14 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // Various maths functions
 // -----------------------
 //
 
-#if !defined __LOL_MATH_FUNCTIONS_H__
-#define __LOL_MATH_FUNCTIONS_H__
+#include <lol/math/constants.h>
 
 #include <cmath>
 #include <cstdio>
@@ -261,5 +262,3 @@ LOL_GENERIC_FUNC_SIGNED(ldouble)
 
 } /* namespace lol */
 
-#endif // __LOL_MATH_FUNCTIONS_H__
-

src/lol/math/geometry.h

@@ -9,18 +9,18 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // Various geometry functions
 // --------------------------
 //
 
-#if !defined __LOL_MATH_GEOMETRY_H__
-#define __LOL_MATH_GEOMETRY_H__
+#include <lol/base/enum.h>
 
 #include <cmath>
 #include <cstdio>
 #include <algorithm>
-
 #include <stdint.h>
 
 namespace lol
@@ -347,5 +347,3 @@ float PointDistToSegment(TV const &p, TV const &a, TV const &b)
 
 } /* namespace lol */
 
-#endif // __LOL_MATH_GEOMETRY_H__
-

src/lol/math/half.h

@@ -8,14 +8,13 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The Half class
 // --------------
 //
 
-#if !defined __LOL_MATH_HALF_H__
-#define __LOL_MATH_HALF_H__
-
 #include <cstdio>
 #include <stdint.h>
 
@@ -227,5 +226,3 @@ DECLARE_HALF_BOOL_OPS(<=)
 
 } /* namespace lol */
 
-#endif // __LOL_MATH_HALF_H__
-

src/lol/math/interp.h

@@ -8,14 +8,13 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // Interpolator classes
 // --------------------
 //
 
-#if !defined __LOL_MATH_INTERP_H__
-#define __LOL_MATH_INTERP_H__
-
 namespace lol
 {
 
@@ -117,5 +116,3 @@ private:
 
 } /* namespace lol */
 
-#endif // __LOL_MATH_INTERP_H__
-

src/lol/math/matrix.h

@@ -8,14 +8,13 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The matrix classes
 // ------------------
 //
 
-#if !defined __LOL_MATH_MATRIX_H__
-#define __LOL_MATH_MATRIX_H__
-
 #include <ostream>
 
 #include <lol/math/vector.h>
@@ -586,5 +585,3 @@ outer(mat_t<T, COLS1, ROWS1> const &a, mat_t<T, COLS2, ROWS2> const &b)
 
 } /* namespace lol */
 
-#endif // __LOL_MATH_MATRIX_H__
-

src/lol/math/ops.h

@@ -8,14 +8,13 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // Operations for vector classes
 // -----------------------------
 //
 
-#if !defined __LOL_MATH_OPS_H__
-#define __LOL_MATH_OPS_H__
-
 #include <ostream>
 #include <type_traits>
 
@@ -361,5 +360,3 @@ operator >=(V const &a, V const &b)
 
 } /* namespace lol */
 
-#endif // __LOL_MATH_OPS_H__
-

src/lol/math/rand.h

@@ -8,14 +8,13 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The Random number generators
 // ----------------------------
 //
 
-#if !defined __LOL_MATH_RAND_H__
-#define __LOL_MATH_RAND_H__
-
 #include <cstdlib>
 #include <stdint.h>
 
@@ -125,5 +124,3 @@ template<> inline ldouble rand<ldouble>() { return rand<ldouble>(1.0); }
 
 } /* namespace lol */
 
-#endif // __LOL_MATH_RAND_H__
-

src/lol/math/real.h

@@ -8,14 +8,13 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The Real class
 // --------------
 //
 
-#if !defined __LOL_MATH_REAL_H__
-#define __LOL_MATH_REAL_H__
-
 #include <stdint.h>
 
 namespace lol
@@ -327,5 +326,3 @@ template<> void real::sprintf(char *str, int ndigits) const;
 
 } /* namespace lol */
 
-#endif // __LOL_MATH_REAL_H__
-

src/lol/math/transform.h

@@ -8,14 +8,13 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The complex, quaternion and dual quaternion classes
 // ---------------------------------------------------
 //
 
-#if !defined __LOL_MATH_TRANSFORM_H__
-#define __LOL_MATH_TRANSFORM_H__
-
 #include <ostream>
 
 namespace lol
@@ -367,5 +366,3 @@ extern quat_t<T> slerp(quat_t<T> const &qa, quat_t<T> const &qb, T f);
 
 } /* namespace lol */
 
-#endif // __LOL_MATH_TRANSFORM_H__
-

src/lol/math/vector.h

@@ -8,20 +8,19 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The vector classes
 // ------------------
 //
 
-#if !defined __LOL_MATH_VECTOR_H__
-#define __LOL_MATH_VECTOR_H__
-
-#include <ostream>
-
 #include <lol/math/half.h>
 #include <lol/math/real.h>
 #include <lol/math/ops.h>
 
+#include <ostream>
+
 namespace lol
 {
 
@@ -1222,5 +1221,3 @@ inline vec_const_iter<T,N,SWIZZLE> end(vec_t<T,N,SWIZZLE> const &a)
 
 } /* namespace lol */
 
-#endif // __LOL_MATH_VECTOR_H__
-

src/lol/public.h

@@ -8,14 +8,13 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The main header
 // ---------------
 //
 
-#if !defined __LOL_ENGINE_H__
-#define __LOL_ENGINE_H__
-
 #include <lol/base/all.h>
 #include <lol/math/all.h>
 #include <lol/algorithm/all.h>
@@ -24,5 +23,3 @@
 #include <lol/gpu/all.h>
 #include <lol/debug/all.h>
 
-#endif // __LOL_ENGINE_H__
-

src/lol/sys/all.h

@@ -8,13 +8,10 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
-#if !defined __LOL_SYS_ALL_H__
-#define __LOL_SYS_ALL_H__
+#pragma once
 
 #include <lol/sys/thread.h>
 #include <lol/sys/init.h>
 #include <lol/sys/file.h>
 #include <lol/sys/timer.h>
 
-#endif // __LOL_SYS_ALL_H__
-

src/lol/sys/file.h

@@ -8,14 +8,13 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // File and buffer reading
 // -----------------------
 //
 
-#if !defined __LOL_SYS_FILE_H__
-#define __LOL_SYS_FILE_H__
-
 #include <stdint.h>
 
 namespace lol
@@ -89,5 +88,3 @@ private:
 
 } /* namespace lol */
 
-#endif // __LOL_SYS_FILE_H__
-

src/lol/sys/init.h

@@ -8,14 +8,13 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // Various system helper functions
 // -------------------------------
 //
 
-#if !defined __LOL_SYS_INIT_H__
-#define __LOL_SYS_INIT_H__
-
 #include <stdint.h>
 
 namespace lol
@@ -58,5 +57,3 @@ extern array<String> GetPathList(String const &file);
 
 } /* namespace lol */
 
-#endif // __LOL_SYS_INIT_H__
-

src/lol/sys/thread.h

@@ -8,14 +8,13 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The Threading classes
 // ---------------------
 //
 
-#if !defined __LOL_SYS_THREAD_H__
-#define __LOL_SYS_THREAD_H__
-
 #if defined __CELLOS_LV2__
 #   include "platform/ps3/threadbase.h"
 #else
@@ -146,5 +145,3 @@ protected:
 
 } /* namespace lol */
 
-#endif // __LOL_SYS_THREAD_H__
-

src/lol/sys/timer.h

@@ -8,14 +8,13 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The Timer class
 // ---------------
 //
 
-#if !defined __LOL_SYS_TIMER_H__
-#define __LOL_SYS_TIMER_H__
-
 namespace lol
 {
 
@@ -41,5 +40,3 @@ private:
 
 } /* namespace lol */
 
-#endif // __LOL_SYS_TIMER_H__
-

src/loldebug.h

@@ -8,17 +8,14 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // Debug entity classes
 // --------------------
 //
 
-#if !defined __LOL_LOLDEBUG_H__
-#define __LOL_LOLDEBUG_H__
-
 #include "debug/fps.h"
 #include "debug/record.h"
 #include "debug/stats.h"
 
-#endif // __LOL_LOLDEBUG_H__
-

src/lolgl.h

@@ -8,14 +8,13 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The GL support
 // --------------
 //
 
-#if !defined __LOL_LOLGL_H__
-#define __LOL_LOLGL_H__
-
 #define GL_GLEXT_PROTOTYPES
 
 /* Prefer GLES on browsers */
@@ -65,5 +64,3 @@
         ASSERT(error == GL_NO_ERROR, "OpenGL error: 0x%04x\n", error); \
     }
 
-#endif // __LOL_LOLGL_H__
-

src/mesh/mesh.h

@@ -8,13 +8,15 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The Mesh class
 // --------------
 //
 
-#if !defined __MESH_MESH_H__
-#define __MESH_MESH_H__
+#include <lol/gpu/vertexbuffer.h>
+#include <lol/gpu/indexbuffer.h>
 
 namespace lol
 {
@@ -76,5 +78,3 @@ protected:
 
 } /* namespace lol */
 
-#endif /* __MESH_MESH_H__ */
-

src/mesh/primitive.h

@@ -8,14 +8,13 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The Primitive class
 // -------------------
 //
 
-#if !defined __MESH_PRIMITIVE_H__
-#define __MESH_PRIMITIVE_H__
-
 #include "mesh/mesh.h"
 
 namespace lol
@@ -36,5 +35,3 @@ private:
 
 } /* namespace lol */
 
-#endif /* __MESH_PRIMITIVE_H__ */
-

src/messageservice.h

@@ -9,14 +9,13 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The Message Service class
 // ----------------
 //
 
-#if !defined __MESSAGESERVICE_H__
-#define __MESSAGESERVICE_H__
-
 namespace lol
 {
 
@@ -87,4 +86,3 @@ extern MessageService *g_messageservice;
 
 } /* namespace lol */
 
-#endif /* __MESSAGESERVICE_H__ */

src/numeric.h

@@ -8,13 +8,14 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The Matrix classes
 // ------------------
 //
 
-#if !defined __LOL_NUMERIC_H__
-#define __LOL_NUMERIC_H__
+#include <lol/math/functions.h>
 
 #include <cstdlib>
 #include <stdint.h>
@@ -77,5 +78,3 @@ static inline float SmoothClamp(float &x, float a, float b, float sd)
 
 } /* namespace lol */
 
-#endif // __LOL_NUMERIC_H__
-

src/platform.h

@@ -8,15 +8,14 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The Platform interface
 // ----------------------
 // Helper functions to set up the platform.
 //
 
-#if !defined __LOL_PLATFORM_H__
-#define __LOL_PLATFORM_H__
-
 #include <stdint.h>
 
 namespace lol
@@ -33,5 +32,3 @@ private:
 
 } /* namespace lol */
 
-#endif // __LOL_PLATFORM_H__
-

src/platform/android/androidapp.h

@@ -8,15 +8,14 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The AndroidApp class
 // --------------------
 //
 
-#if !defined __LOL_ANDROIDAPP_H__
-#define __LOL_ANDROIDAPP_H__
-
-#include "lol/math/vector.h"
+#include <lol/math/vector.h>
 
 namespace lol
 {
@@ -38,5 +37,3 @@ private:
 
 } /* namespace lol */
 
-#endif // __LOL_ANDROIDAPP_H__
-

src/platform/d3d9/d3d9input.h

@@ -8,14 +8,13 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The D3d9Input class
 // -------------------
 //
 
-#if !defined __LOL_D3D9INPUT_H__
-#define __LOL_D3D9INPUT_H__
-
 #include "entity.h"
 
 namespace lol
@@ -39,5 +38,3 @@ private:
 
 } /* namespace lol */
 
-#endif // __LOL_D3D9INPUT_H__
-

src/platform/nacl/nacl-app.h

@@ -8,15 +8,14 @@
 //   http://www.wtfpl.net/ for more details.
 //
 
+#pragma once
+
 //
 // The NaClApp class
 // -----------------
 //
 
-#if !defined __LOL_NACLAPP_H__
-#define __LOL_NACLAPP_H__
-
-#include "lol/math/vector.h"
+#include <lol/math/vector.h>
 
 namespace lol
 {
@@ -38,5 +37,3 @@ private:
 
 } /* namespace lol */
 
-#endif // __LOL_NACLAPP_H__
-

src/platform/nacl/nacl-instance.h

@@ -2,8 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef EXAMPLES_TUMBLER_TUMBLER_H_
-#define EXAMPLES_TUMBLER_TUMBLER_H_
+#pragma once
 
 #include <ppapi/cpp/instance.h>
 #include <ppapi/c/ppb_gamepad.h>
@@ -105,4 +104,3 @@ private:
 
 }  // namespace lol
 
-#endif  // EXAMPLES_TUMBLER_TUMBLER_H_

src/platform/nacl/opengl_context.h

@@ -2,8 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef EXAMPLES_TUMBLER_OPENGL_CONTEXT_H_
-#define EXAMPLES_TUMBLER_OPENGL_CONTEXT_H_
+#pragma once
 
 ///
 /// @file
@@ -92,5 +91,3 @@ class OpenGLContext : public pp::Graphics3DClient {
 
 }  // namespace lol
 
-#endif  // EXAMPLES_TUMBLER_OPENGL_CONTEXT_H_
-

src/platform/nacl/opengl_context_ptrs.h

@@ -2,8 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef EXAMPLES_TUMBLER_OPENGL_CONTEXT_PTRS_H_
-#define EXAMPLES_TUMBLER_OPENGL_CONTEXT_PTRS_H_
+#pragma once
 
 // A convenience wrapper for a shared OpenGLContext pointer type.  As other
 // smart pointer types are needed, add them here.
@@ -18,5 +17,3 @@ typedef std::tr1::shared_ptr<OpenGLContext> SharedOpenGLContext;
 
 }  // namespace lol
 
-#endif  // EXAMPLES_TUMBLER_OPENGL_CONTEXT_PTRS_H_
-