13 files changed, 13 insertions, 52 deletions
diff --git a/src/mbgl/text/check_max_angle.hpp b/src/mbgl/text/check_max_angle.hpp
index 0fb8a715a9..5e1ff6f049 100644
--- a/src/mbgl/text/check_max_angle.hpp
+++ b/src/mbgl/text/check_max_angle.hpp
@@ -1,5 +1,4 @@
-#ifndef MBGL_TEXT_CHECK_MAX_ANGLE
-#define MBGL_TEXT_CHECK_MAX_ANGLE
+#pragma once
 
 #include <mbgl/tile/geometry_tile.hpp>
 
@@ -11,5 +10,3 @@ bool checkMaxAngle(const GeometryCoordinates &line, Anchor &anchor, const float
         const float windowSize, const float maxAngle);
 
 } // namespace mbgl
-
-#endif
diff --git a/src/mbgl/text/collision_feature.hpp b/src/mbgl/text/collision_feature.hpp
index 840b37b943..0fcc083a19 100644
--- a/src/mbgl/text/collision_feature.hpp
+++ b/src/mbgl/text/collision_feature.hpp
@@ -1,5 +1,4 @@
-#ifndef MBGL_TEXT_COLLISION_FEATURE
-#define MBGL_TEXT_COLLISION_FEATURE
+#pragma once
 
 #include <mbgl/geometry/anchor.hpp>
 #include <mbgl/text/shaping.hpp>
@@ -63,5 +62,3 @@ namespace mbgl {
                     const int segment, const float length, const float height);
     };
 } // namespace mbgl
-
-#endif
diff --git a/src/mbgl/text/collision_tile.hpp b/src/mbgl/text/collision_tile.hpp
index 0be2dabdbf..7450fb1b86 100644
--- a/src/mbgl/text/collision_tile.hpp
+++ b/src/mbgl/text/collision_tile.hpp
@@ -1,5 +1,4 @@
-#ifndef MBGL_TEXT_COLLISION_TILE
-#define MBGL_TEXT_COLLISION_TILE
+#pragma once
 
 #include <mbgl/text/collision_feature.hpp>
 #include <mbgl/text/placement_config.hpp>
@@ -64,5 +63,3 @@ private:
 };
 
 } // namespace mbgl
-
-#endif
diff --git a/src/mbgl/text/get_anchors.hpp b/src/mbgl/text/get_anchors.hpp
index 1f76685f9a..9a0a5a650c 100644
--- a/src/mbgl/text/get_anchors.hpp
+++ b/src/mbgl/text/get_anchors.hpp
@@ -1,5 +1,4 @@
-#ifndef MBGL_TEXT_GETANCHORS
-#define MBGL_TEXT_GETANCHORS
+#pragma once
 
 #include <mbgl/geometry/anchor.hpp>
 #include <mbgl/tile/geometry_tile.hpp>
@@ -12,5 +11,3 @@ Anchors getAnchors(const GeometryCoordinates &line, float spacing,
         const float iconLeft, const float iconRight,
         const float glyphSize, const float boxScale, const float overscaling);
 } // namespace mbgl
-
-#endif
diff --git a/src/mbgl/text/glyph.hpp b/src/mbgl/text/glyph.hpp
index e4984be868..b5891831d5 100644
--- a/src/mbgl/text/glyph.hpp
+++ b/src/mbgl/text/glyph.hpp
@@ -1,5 +1,4 @@
-#ifndef MBGL_TEXT_GLYPH
-#define MBGL_TEXT_GLYPH
+#pragma once
 
 #include <mbgl/text/glyph_range.hpp>
 #include <mbgl/util/rect.hpp>
@@ -81,5 +80,3 @@ public:
 };
 
 } // end namespace mbgl
-
-#endif
diff --git a/src/mbgl/text/glyph_pbf.hpp b/src/mbgl/text/glyph_pbf.hpp
index 37e1b4dbd3..08616b268b 100644
--- a/src/mbgl/text/glyph_pbf.hpp
+++ b/src/mbgl/text/glyph_pbf.hpp
@@ -1,5 +1,4 @@
-#ifndef MBGL_TEXT_GLYPH_PBF
-#define MBGL_TEXT_GLYPH_PBF
+#pragma once
 
 #include <mbgl/text/glyph.hpp>
 #include <mbgl/text/glyph_store.hpp>
@@ -36,5 +35,3 @@ private:
 };
 
 } // namespace mbgl
-
-#endif
diff --git a/src/mbgl/text/glyph_range.hpp b/src/mbgl/text/glyph_range.hpp
index 7a0c276df2..644046d7f8 100644
--- a/src/mbgl/text/glyph_range.hpp
+++ b/src/mbgl/text/glyph_range.hpp
@@ -1,5 +1,4 @@
-#ifndef MBGL_TEXT_GLYPH_RANGE
-#define MBGL_TEXT_GLYPH_RANGE
+#pragma once
 
 #include <utility>
 #include <cstdint>
@@ -9,5 +8,3 @@ namespace mbgl {
 typedef std::pair<uint16_t, uint16_t> GlyphRange;
 
 } // end namespace mbgl
-
-#endif
diff --git a/src/mbgl/text/glyph_set.hpp b/src/mbgl/text/glyph_set.hpp
index 40f87835fd..77e2cb1c95 100644
--- a/src/mbgl/text/glyph_set.hpp
+++ b/src/mbgl/text/glyph_set.hpp
@@ -1,5 +1,4 @@
-#ifndef MBGL_TEXT_GLYPH_SET
-#define MBGL_TEXT_GLYPH_SET
+#pragma once
 
 #include <mbgl/text/glyph.hpp>
 #include <mbgl/util/geometry.hpp>
@@ -21,5 +20,3 @@ private:
 };
 
 } // end namespace mbgl
-
-#endif
diff --git a/src/mbgl/text/glyph_store.hpp b/src/mbgl/text/glyph_store.hpp
index 240da58b6e..d614a4947f 100644
--- a/src/mbgl/text/glyph_store.hpp
+++ b/src/mbgl/text/glyph_store.hpp
@@ -1,5 +1,4 @@
-#ifndef MBGL_TEXT_GLYPH_STORE
-#define MBGL_TEXT_GLYPH_STORE
+#pragma once
 
 #include <mbgl/text/glyph.hpp>
 #include <mbgl/text/glyph_set.hpp>
@@ -65,5 +64,3 @@ private:
 };
 
 } // namespace mbgl
-
-#endif
diff --git a/src/mbgl/text/glyph_store_observer.hpp b/src/mbgl/text/glyph_store_observer.hpp
index 2ed1b2d5d9..89650892ea 100644
--- a/src/mbgl/text/glyph_store_observer.hpp
+++ b/src/mbgl/text/glyph_store_observer.hpp
@@ -1,5 +1,4 @@
-#ifndef MBGL_TEXT_GLYPH_STORE_OBSERVER
-#define MBGL_TEXT_GLYPH_STORE_OBSERVER
+#pragma once
 
 #include <mbgl/style/types.hpp>
 #include <mbgl/text/glyph_range.hpp>
@@ -17,5 +16,3 @@ public:
 };
 
 } // namespace mbgl
-
-#endif
diff --git a/src/mbgl/text/placement_config.hpp b/src/mbgl/text/placement_config.hpp
index 6680f52449..75345b89e8 100644
--- a/src/mbgl/text/placement_config.hpp
+++ b/src/mbgl/text/placement_config.hpp
@@ -1,5 +1,4 @@
-#ifndef MBGL_TEXT_PLACEMENT_CONFIG
-#define MBGL_TEXT_PLACEMENT_CONFIG
+#pragma once
 
 namespace mbgl {
 
@@ -24,5 +23,3 @@ public:
 };
 
 } // namespace mbgl
-
-#endif
diff --git a/src/mbgl/text/quads.hpp b/src/mbgl/text/quads.hpp
index 03f86e1df9..c68ea2fe6a 100644
--- a/src/mbgl/text/quads.hpp
+++ b/src/mbgl/text/quads.hpp
@@ -1,5 +1,4 @@
-#ifndef MBGL_TEXT_QUADS
-#define MBGL_TEXT_QUADS
+#pragma once
 
 #include <mbgl/text/glyph.hpp>
 #include <mbgl/tile/geometry_tile.hpp>
@@ -44,5 +43,3 @@ namespace mbgl {
             const float boxScale, const GeometryCoordinates& line, const SymbolLayoutProperties& layout,
             const bool alongLine, const GlyphPositions& face);
 } // namespace mbgl
-
-#endif
diff --git a/src/mbgl/text/shaping.hpp b/src/mbgl/text/shaping.hpp
index 89249ee605..ea169b8dc6 100644
--- a/src/mbgl/text/shaping.hpp
+++ b/src/mbgl/text/shaping.hpp
@@ -1,5 +1,4 @@
-#ifndef MBGL_TEXT_SHAPING
-#define MBGL_TEXT_SHAPING
+#pragma once
 
 #include <mbgl/text/glyph.hpp>
 #include <mbgl/sprite/sprite_atlas.hpp>
@@ -31,5 +30,3 @@ namespace mbgl {
     PositionedIcon shapeIcon(const SpriteAtlasElement& image, const SymbolLayoutProperties&);
 
 } // namespace mbgl
-
-#endif