diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2016-05-25 21:14:18 +0200 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2016-05-25 21:35:37 +0200 |
commit | e2bcea90fce8a1e05e517c615d21d845e955f53d (patch) | |
tree | 208da7ad0db235a13b5ae6d360279a624e46fb95 /src/mbgl/tile | |
parent | 6368403f433cfbfed1547d4167a9836fa2942a97 (diff) | |
download | qtlocation-mapboxgl-e2bcea90fce8a1e05e517c615d21d845e955f53d.tar.gz |
[core] use #pragma once instead of ifdef include guards
Diffstat (limited to 'src/mbgl/tile')
-rw-r--r-- | src/mbgl/tile/geojson_tile.hpp | 5 | ||||
-rw-r--r-- | src/mbgl/tile/geometry_tile.hpp | 5 | ||||
-rw-r--r-- | src/mbgl/tile/raster_tile_data.hpp | 5 | ||||
-rw-r--r-- | src/mbgl/tile/tile.hpp | 5 | ||||
-rw-r--r-- | src/mbgl/tile/tile_cache.hpp | 5 | ||||
-rw-r--r-- | src/mbgl/tile/tile_data.hpp | 5 | ||||
-rw-r--r-- | src/mbgl/tile/tile_id.hpp | 5 | ||||
-rw-r--r-- | src/mbgl/tile/tile_worker.hpp | 5 | ||||
-rw-r--r-- | src/mbgl/tile/vector_tile.hpp | 5 | ||||
-rw-r--r-- | src/mbgl/tile/vector_tile_data.hpp | 5 |
10 files changed, 10 insertions, 40 deletions
diff --git a/src/mbgl/tile/geojson_tile.hpp b/src/mbgl/tile/geojson_tile.hpp index 6a490c39a2..04ecbc9a24 100644 --- a/src/mbgl/tile/geojson_tile.hpp +++ b/src/mbgl/tile/geojson_tile.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_ANNOTATION_GEOJSON_VT_TILE -#define MBGL_ANNOTATION_GEOJSON_VT_TILE +#pragma once #include <mbgl/tile/geometry_tile.hpp> #include <mbgl/tile/tile_id.hpp> @@ -74,5 +73,3 @@ private: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/tile/geometry_tile.hpp b/src/mbgl/tile/geometry_tile.hpp index d98e1b3b0c..347d21e62c 100644 --- a/src/mbgl/tile/geometry_tile.hpp +++ b/src/mbgl/tile/geometry_tile.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_MAP_GEOMETRY_TILE -#define MBGL_MAP_GEOMETRY_TILE +#pragma once #include <mbgl/util/geometry.hpp> #include <mbgl/util/feature.hpp> @@ -96,5 +95,3 @@ std::vector<GeometryCollection> classifyRings(const GeometryCollection&); Feature convertFeature(const GeometryTileFeature&, const CanonicalTileID&); } // namespace mbgl - -#endif diff --git a/src/mbgl/tile/raster_tile_data.hpp b/src/mbgl/tile/raster_tile_data.hpp index af15bba948..46261b2b4d 100644 --- a/src/mbgl/tile/raster_tile_data.hpp +++ b/src/mbgl/tile/raster_tile_data.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_MAP_RASTER_TILE_DATA -#define MBGL_MAP_RASTER_TILE_DATA +#pragma once #include <mbgl/tile/tile_data.hpp> #include <mbgl/renderer/raster_bucket.hpp> @@ -35,5 +34,3 @@ private: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/tile/tile.hpp b/src/mbgl/tile/tile.hpp index f66df9c748..1e35e78735 100644 --- a/src/mbgl/tile/tile.hpp +++ b/src/mbgl/tile/tile.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_MAP_TILE -#define MBGL_MAP_TILE +#pragma once #include <mbgl/tile/tile_id.hpp> #include <mbgl/util/mat4.hpp> @@ -27,5 +26,3 @@ public: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/tile/tile_cache.hpp b/src/mbgl/tile/tile_cache.hpp index e63d8cee99..edaa6bd680 100644 --- a/src/mbgl/tile/tile_cache.hpp +++ b/src/mbgl/tile/tile_cache.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_MAP_TILE_CACHE -#define MBGL_MAP_TILE_CACHE +#pragma once #include <mbgl/tile/tile_id.hpp> @@ -30,5 +29,3 @@ private: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/tile/tile_data.hpp b/src/mbgl/tile/tile_data.hpp index 738b872bf5..6552ad0f91 100644 --- a/src/mbgl/tile/tile_data.hpp +++ b/src/mbgl/tile/tile_data.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_MAP_TILE_DATA -#define MBGL_MAP_TILE_DATA +#pragma once #include <mbgl/util/noncopyable.hpp> #include <mbgl/util/chrono.hpp> @@ -117,5 +116,3 @@ protected: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/tile/tile_id.hpp b/src/mbgl/tile/tile_id.hpp index 8c86c0d09c..f9afdfa529 100644 --- a/src/mbgl/tile/tile_id.hpp +++ b/src/mbgl/tile/tile_id.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_TILE_TILE_ID -#define MBGL_TILE_TILE_ID +#pragma once #include <mbgl/util/constants.hpp> @@ -266,5 +265,3 @@ inline float UnwrappedTileID::pixelsToTileUnits(const float pixelValue, const fl } } // namespace mbgl - -#endif diff --git a/src/mbgl/tile/tile_worker.hpp b/src/mbgl/tile/tile_worker.hpp index 7cb2536c90..91f3b04804 100644 --- a/src/mbgl/tile/tile_worker.hpp +++ b/src/mbgl/tile/tile_worker.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_MAP_TILE_WORKER -#define MBGL_MAP_TILE_WORKER +#pragma once #include <mbgl/map/mode.hpp> #include <mbgl/tile/tile_data.hpp> @@ -95,5 +94,3 @@ private: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/tile/vector_tile.hpp b/src/mbgl/tile/vector_tile.hpp index d41d4f4f34..aed7b7ee03 100644 --- a/src/mbgl/tile/vector_tile.hpp +++ b/src/mbgl/tile/vector_tile.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_MAP_VECTOR_TILE -#define MBGL_MAP_VECTOR_TILE +#pragma once #include <mbgl/tile/geometry_tile.hpp> #include <mbgl/tile/tile_id.hpp> @@ -83,5 +82,3 @@ private: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/tile/vector_tile_data.hpp b/src/mbgl/tile/vector_tile_data.hpp index c64d255a0a..d7f31bcab2 100644 --- a/src/mbgl/tile/vector_tile_data.hpp +++ b/src/mbgl/tile/vector_tile_data.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_MAP_VECTOR_TILE_DATA -#define MBGL_MAP_VECTOR_TILE_DATA +#pragma once #include <mbgl/tile/tile_data.hpp> #include <mbgl/tile/tile_worker.hpp> @@ -70,5 +69,3 @@ private: }; } // namespace mbgl - -#endif |