From e2bcea90fce8a1e05e517c615d21d845e955f53d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Wed, 25 May 2016 21:14:18 +0200 Subject: [PATCH] [core] use #pragma once instead of ifdef include guards --- include/mbgl/annotation/annotation.hpp | 5 +---- include/mbgl/annotation/point_annotation.hpp | 5 +---- include/mbgl/annotation/shape_annotation.hpp | 5 +---- include/mbgl/gl/gl.hpp | 5 +---- include/mbgl/gl/gl_helper.hpp | 5 +---- include/mbgl/gl/gl_values.hpp | 7 ++----- include/mbgl/map/camera.hpp | 5 +---- include/mbgl/map/map.hpp | 5 +---- include/mbgl/map/mode.hpp | 5 +---- include/mbgl/map/update.hpp | 5 +---- include/mbgl/map/view.hpp | 5 +---- include/mbgl/mbgl.hpp | 5 +---- include/mbgl/platform/darwin/settings_nsuserdefaults.hpp | 5 +---- include/mbgl/platform/default/glfw_view.hpp | 5 +---- include/mbgl/platform/default/headless_display.hpp | 5 +---- include/mbgl/platform/default/headless_view.hpp | 5 +---- include/mbgl/platform/default/settings_json.hpp | 5 +---- include/mbgl/platform/event.hpp | 5 +---- include/mbgl/platform/log.hpp | 5 +---- include/mbgl/platform/platform.hpp | 5 +---- include/mbgl/sprite/sprite_image.hpp | 5 +---- include/mbgl/storage/default_file_source.hpp | 5 +---- include/mbgl/storage/file_source.hpp | 5 +---- include/mbgl/storage/network_status.hpp | 5 +---- include/mbgl/storage/online_file_source.hpp | 5 +---- include/mbgl/storage/resource.hpp | 5 +---- include/mbgl/storage/response.hpp | 5 +---- include/mbgl/style/property_transition.hpp | 5 +---- include/mbgl/style/types.hpp | 5 +---- include/mbgl/util/chrono.hpp | 5 +---- include/mbgl/util/constants.hpp | 5 +---- include/mbgl/util/default_styles.hpp | 5 +---- include/mbgl/util/enum.hpp | 5 +---- include/mbgl/util/exception.hpp | 5 +---- include/mbgl/util/geo.hpp | 5 +---- include/mbgl/util/image.hpp | 5 +---- include/mbgl/util/noncopyable.hpp | 5 +---- include/mbgl/util/optional.hpp | 5 +---- include/mbgl/util/projection.hpp | 5 +---- include/mbgl/util/run_loop.hpp | 5 +---- include/mbgl/util/string.hpp | 5 +---- include/mbgl/util/timer.hpp | 5 +---- include/mbgl/util/traits.hpp | 5 +---- include/mbgl/util/unitbezier.hpp | 5 +---- include/mbgl/util/util.hpp | 5 +---- include/mbgl/util/work_request.hpp | 5 +---- include/mbgl/util/work_task.hpp | 5 +---- platform/android/src/jni.hpp | 5 +---- platform/android/src/native_map_view.hpp | 5 +---- platform/default/mbgl/storage/offline_database.hpp | 5 +---- platform/ios/benchmark/locations.hpp | 5 +---- scripts/build-shaders.py | 7 ++----- scripts/build-version.py | 9 +++------ src/mbgl/algorithm/covered_by_children.hpp | 5 +---- src/mbgl/algorithm/generate_clip_ids.hpp | 5 +---- src/mbgl/algorithm/generate_clip_ids_impl.hpp | 5 +---- src/mbgl/algorithm/update_renderables.hpp | 5 +---- src/mbgl/algorithm/update_renderables_impl.hpp | 5 +---- src/mbgl/annotation/annotation_manager.hpp | 5 +---- src/mbgl/annotation/annotation_tile.hpp | 5 +---- src/mbgl/annotation/point_annotation_impl.hpp | 5 +---- src/mbgl/annotation/shape_annotation_impl.hpp | 5 +---- src/mbgl/geometry/anchor.hpp | 5 +---- src/mbgl/geometry/binpack.hpp | 5 +---- src/mbgl/geometry/buffer.hpp | 5 +---- src/mbgl/geometry/circle_buffer.hpp | 5 +---- src/mbgl/geometry/collision_box_buffer.hpp | 5 +---- src/mbgl/geometry/debug_font_buffer.hpp | 5 +---- src/mbgl/geometry/elements_buffer.hpp | 5 +---- src/mbgl/geometry/feature_index.hpp | 5 +---- src/mbgl/geometry/fill_buffer.hpp | 5 +---- src/mbgl/geometry/glyph_atlas.hpp | 5 +---- src/mbgl/geometry/icon_buffer.hpp | 5 +---- src/mbgl/geometry/line_atlas.hpp | 5 +---- src/mbgl/geometry/line_buffer.hpp | 5 +---- src/mbgl/geometry/static_vertex_buffer.hpp | 5 +---- src/mbgl/geometry/text_buffer.hpp | 5 +---- src/mbgl/geometry/vao.hpp | 5 +---- src/mbgl/gl/debugging.hpp | 5 +---- src/mbgl/gl/gl_config.hpp | 5 +---- src/mbgl/gl/gl_object_store.hpp | 5 +---- src/mbgl/gl/texture_pool.hpp | 5 +---- src/mbgl/layer/background_layer.hpp | 5 +---- src/mbgl/layer/circle_layer.hpp | 5 +---- src/mbgl/layer/custom_layer.hpp | 5 +---- src/mbgl/layer/fill_layer.hpp | 5 +---- src/mbgl/layer/line_layer.hpp | 5 +---- src/mbgl/layer/raster_layer.hpp | 5 +---- src/mbgl/layer/symbol_layer.hpp | 5 +---- src/mbgl/map/change.hpp | 5 +---- src/mbgl/map/transform.hpp | 5 +---- src/mbgl/map/transform_state.hpp | 5 +---- src/mbgl/renderer/bucket.hpp | 5 +---- src/mbgl/renderer/circle_bucket.hpp | 5 +---- src/mbgl/renderer/debug_bucket.hpp | 5 +---- src/mbgl/renderer/fill_bucket.hpp | 5 +---- src/mbgl/renderer/frame_history.hpp | 5 +---- src/mbgl/renderer/line_bucket.hpp | 5 +---- src/mbgl/renderer/painter.hpp | 5 +---- src/mbgl/renderer/raster_bucket.hpp | 5 +---- src/mbgl/renderer/render_pass.hpp | 5 +---- src/mbgl/renderer/renderable.hpp | 5 +---- src/mbgl/renderer/symbol_bucket.hpp | 5 +---- src/mbgl/shader/box_shader.hpp | 5 +---- src/mbgl/shader/circle_shader.hpp | 5 +---- src/mbgl/shader/dot_shader.hpp | 5 +---- src/mbgl/shader/icon_shader.hpp | 5 +---- src/mbgl/shader/line_shader.hpp | 5 +---- src/mbgl/shader/linepattern_shader.hpp | 5 +---- src/mbgl/shader/linesdf_shader.hpp | 5 +---- src/mbgl/shader/outline_shader.hpp | 5 +---- src/mbgl/shader/outlinepattern_shader.hpp | 5 +---- src/mbgl/shader/pattern_shader.hpp | 5 +---- src/mbgl/shader/plain_shader.hpp | 5 +---- src/mbgl/shader/raster_shader.hpp | 5 +---- src/mbgl/shader/sdf_shader.hpp | 5 +---- src/mbgl/shader/shader.hpp | 5 +---- src/mbgl/shader/uniform.hpp | 5 +---- src/mbgl/source/source.hpp | 5 +---- src/mbgl/source/source_info.hpp | 5 +---- src/mbgl/source/source_observer.hpp | 5 +---- src/mbgl/sprite/sprite_atlas.hpp | 5 +---- src/mbgl/sprite/sprite_parser.hpp | 5 +---- src/mbgl/sprite/sprite_store.hpp | 5 +---- src/mbgl/sprite/sprite_store_observer.hpp | 5 +---- src/mbgl/storage/asset_file_source.hpp | 5 +---- src/mbgl/storage/http_file_source.hpp | 5 +---- src/mbgl/style/class_dictionary.hpp | 5 +---- src/mbgl/style/function.hpp | 5 +---- src/mbgl/style/function_evaluator.hpp | 5 +---- src/mbgl/style/layout_property.hpp | 5 +---- src/mbgl/style/paint_property.hpp | 5 +---- src/mbgl/style/render_item.hpp | 5 +---- src/mbgl/style/style.hpp | 5 +---- src/mbgl/style/style_bucket_parameters.hpp | 5 +---- src/mbgl/style/style_calculation_parameters.hpp | 5 +---- src/mbgl/style/style_cascade_parameters.hpp | 5 +---- src/mbgl/style/style_layer.hpp | 5 +---- src/mbgl/style/style_observer.hpp | 5 +---- src/mbgl/style/style_parser.hpp | 5 +---- src/mbgl/style/style_render_parameters.hpp | 5 +---- src/mbgl/style/style_update_parameters.hpp | 5 +---- src/mbgl/style/zoom_history.hpp | 5 +---- src/mbgl/text/check_max_angle.hpp | 5 +---- src/mbgl/text/collision_feature.hpp | 5 +---- src/mbgl/text/collision_tile.hpp | 5 +---- src/mbgl/text/get_anchors.hpp | 5 +---- src/mbgl/text/glyph.hpp | 5 +---- src/mbgl/text/glyph_pbf.hpp | 5 +---- src/mbgl/text/glyph_range.hpp | 5 +---- src/mbgl/text/glyph_set.hpp | 5 +---- src/mbgl/text/glyph_store.hpp | 5 +---- src/mbgl/text/glyph_store_observer.hpp | 5 +---- src/mbgl/text/placement_config.hpp | 5 +---- src/mbgl/text/quads.hpp | 5 +---- src/mbgl/text/shaping.hpp | 5 +---- src/mbgl/tile/geojson_tile.hpp | 5 +---- src/mbgl/tile/geometry_tile.hpp | 5 +---- src/mbgl/tile/raster_tile_data.hpp | 5 +---- src/mbgl/tile/tile.hpp | 5 +---- src/mbgl/tile/tile_cache.hpp | 5 +---- src/mbgl/tile/tile_data.hpp | 5 +---- src/mbgl/tile/tile_id.hpp | 5 +---- src/mbgl/tile/tile_worker.hpp | 5 +---- src/mbgl/tile/vector_tile.hpp | 5 +---- src/mbgl/tile/vector_tile_data.hpp | 5 +---- src/mbgl/util/assert.hpp | 5 +---- src/mbgl/util/async_task.hpp | 5 +---- src/mbgl/util/channel.hpp | 5 +---- src/mbgl/util/clip_id.hpp | 5 +---- src/mbgl/util/clip_lines.hpp | 5 +---- src/mbgl/util/compression.hpp | 5 +---- src/mbgl/util/dtoa.hpp | 5 +---- src/mbgl/util/exclusive.hpp | 5 +---- src/mbgl/util/http_header.hpp | 5 +---- src/mbgl/util/intersection_tests.hpp | 5 +---- src/mbgl/util/io.hpp | 5 +---- src/mbgl/util/mapbox.hpp | 5 +---- src/mbgl/util/mat2.hpp | 5 +---- src/mbgl/util/mat3.hpp | 5 +---- src/mbgl/util/mat4.hpp | 5 +---- src/mbgl/util/math.hpp | 5 +---- src/mbgl/util/merge_lines.hpp | 5 +---- src/mbgl/util/premultiply.hpp | 5 +---- src/mbgl/util/ptr.hpp | 5 +---- src/mbgl/util/rapidjson.hpp | 5 +---- src/mbgl/util/raster.hpp | 5 +---- src/mbgl/util/rect.hpp | 5 +---- src/mbgl/util/std.hpp | 5 +---- src/mbgl/util/stopwatch.hpp | 5 +---- src/mbgl/util/thread.hpp | 5 +---- src/mbgl/util/thread_context.hpp | 5 +---- src/mbgl/util/thread_local.hpp | 5 +---- src/mbgl/util/tile_cover.hpp | 5 +---- src/mbgl/util/token.hpp | 5 +---- src/mbgl/util/transition.hpp | 5 +---- src/mbgl/util/url.hpp | 5 +---- src/mbgl/util/utf.hpp | 5 +---- src/mbgl/util/variant.hpp | 5 +---- src/mbgl/util/work_queue.hpp | 5 +---- src/mbgl/util/worker.hpp | 5 +---- test/algorithm/mock.hpp | 5 +---- test/src/mbgl/test/fixture_log_observer.hpp | 5 +---- test/src/mbgl/test/stub_file_source.hpp | 7 ++----- test/src/mbgl/test/stub_style_observer.hpp | 5 +---- test/src/mbgl/test/util.hpp | 5 +---- 206 files changed, 211 insertions(+), 829 deletions(-) diff --git a/include/mbgl/annotation/annotation.hpp b/include/mbgl/annotation/annotation.hpp index 00b2446e4..52916549c 100644 --- a/include/mbgl/annotation/annotation.hpp +++ b/include/mbgl/annotation/annotation.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_ANNOTATION -#define MBGL_ANNOTATION +#pragma once #include #include @@ -10,5 +9,3 @@ using AnnotationID = uint32_t; using AnnotationIDs = std::vector; } // namespace mbgl - -#endif diff --git a/include/mbgl/annotation/point_annotation.hpp b/include/mbgl/annotation/point_annotation.hpp index 3dea9a3e3..c9236c3c0 100644 --- a/include/mbgl/annotation/point_annotation.hpp +++ b/include/mbgl/annotation/point_annotation.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_ANNOTATION_POINT_ANNOTATION -#define MBGL_ANNOTATION_POINT_ANNOTATION +#pragma once #include @@ -17,5 +16,3 @@ public: }; } // namespace mbgl - -#endif diff --git a/include/mbgl/annotation/shape_annotation.hpp b/include/mbgl/annotation/shape_annotation.hpp index 4d8d35d9c..6e3fe95dd 100644 --- a/include/mbgl/annotation/shape_annotation.hpp +++ b/include/mbgl/annotation/shape_annotation.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_ANNOTATION_SHAPE_ANNOTATION -#define MBGL_ANNOTATION_SHAPE_ANNOTATION +#pragma once #include #include @@ -53,5 +52,3 @@ private: }; } // namespace mbgl - -#endif diff --git a/include/mbgl/gl/gl.hpp b/include/mbgl/gl/gl.hpp index 5ef76cf1d..6d601d8a2 100644 --- a/include/mbgl/gl/gl.hpp +++ b/include/mbgl/gl/gl.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_GL_GL -#define MBGL_GL_GL +#pragma once //#define GL_TRACK @@ -164,5 +163,3 @@ void mbx_glTexImage2D(GLenum target, GLenum type, const GLvoid * data); #endif - -#endif diff --git a/include/mbgl/gl/gl_helper.hpp b/include/mbgl/gl/gl_helper.hpp index 4f3990a43..893c73e0c 100644 --- a/include/mbgl/gl/gl_helper.hpp +++ b/include/mbgl/gl/gl_helper.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_GL_GL_HELPER -#define MBGL_GL_GL_HELPER +#pragma once namespace mbgl { namespace gl { @@ -19,5 +18,3 @@ private: } // namespace gl } // namespace mbgl - -#endif diff --git a/include/mbgl/gl/gl_values.hpp b/include/mbgl/gl/gl_values.hpp index b96cfe310..4204ca8e1 100644 --- a/include/mbgl/gl/gl_values.hpp +++ b/include/mbgl/gl/gl_values.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_GL_GL_VALUES -#define MBGL_GL_GL_VALUES +#pragma once #include #include @@ -286,9 +285,7 @@ struct RasterPos { } }; -#endif +#endif // GL_ES_VERSION_2_0 } // namespace gl } // namespace mbgl - -#endif // MBGL_RENDERER_GL_CONFIG diff --git a/include/mbgl/map/camera.hpp b/include/mbgl/map/camera.hpp index 2e20a6386..452032165 100644 --- a/include/mbgl/map/camera.hpp +++ b/include/mbgl/map/camera.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_MAP_CAMERA -#define MBGL_MAP_CAMERA +#pragma once #include #include @@ -76,5 +75,3 @@ struct AnimationOptions { }; } // namespace mbgl - -#endif /* MBGL_MAP_CAMERA */ diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index 39f0c8695..f074a5ae5 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_MAP_MAP -#define MBGL_MAP_MAP +#pragma once #include #include @@ -186,5 +185,3 @@ private: }; } // namespace mbgl - -#endif diff --git a/include/mbgl/map/mode.hpp b/include/mbgl/map/mode.hpp index d94cdc0eb..074bc3f08 100644 --- a/include/mbgl/map/mode.hpp +++ b/include/mbgl/map/mode.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_MAP_MODE -#define MBGL_MAP_MODE +#pragma once #include @@ -63,5 +62,3 @@ inline bool operator& (const MapDebugOptions& lhs, const MapDebugOptions& rhs) { } } // namespace mbgl - -#endif // MBGL_MAP_MODE diff --git a/include/mbgl/map/update.hpp b/include/mbgl/map/update.hpp index 4ad1b1d19..3915545bb 100644 --- a/include/mbgl/map/update.hpp +++ b/include/mbgl/map/update.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_MAP_UPDATE -#define MBGL_MAP_UPDATE +#pragma once #include @@ -31,5 +30,3 @@ inline bool operator& (const Update& lhs, const Update& rhs) { } } // namespace mbgl - -#endif // MBGL_MAP_UPDATE diff --git a/include/mbgl/map/view.hpp b/include/mbgl/map/view.hpp index c62cc32bf..4431e2b33 100644 --- a/include/mbgl/map/view.hpp +++ b/include/mbgl/map/view.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_MAP_VIEW -#define MBGL_MAP_VIEW +#pragma once #include #include @@ -61,5 +60,3 @@ protected: mbgl::Map *map = nullptr; }; } // namespace mbgl - -#endif diff --git a/include/mbgl/mbgl.hpp b/include/mbgl/mbgl.hpp index 90abd4e11..5cfc9cb45 100644 --- a/include/mbgl/mbgl.hpp +++ b/include/mbgl/mbgl.hpp @@ -1,7 +1,4 @@ -#ifndef MBGL_MAIN -#define MBGL_MAIN +#pragma once #include "map/map.hpp" #include "map/view.hpp" - -#endif diff --git a/include/mbgl/platform/darwin/settings_nsuserdefaults.hpp b/include/mbgl/platform/darwin/settings_nsuserdefaults.hpp index 6364f249d..b0ca060b8 100644 --- a/include/mbgl/platform/darwin/settings_nsuserdefaults.hpp +++ b/include/mbgl/platform/darwin/settings_nsuserdefaults.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_COMMON_SETTINGS_NSUSERDEFAULTS -#define MBGL_COMMON_SETTINGS_NSUSERDEFAULTS +#pragma once #import @@ -26,5 +25,3 @@ public: }; } - -#endif diff --git a/include/mbgl/platform/default/glfw_view.hpp b/include/mbgl/platform/default/glfw_view.hpp index 80cf028f7..b5931e626 100644 --- a/include/mbgl/platform/default/glfw_view.hpp +++ b/include/mbgl/platform/default/glfw_view.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_COMMON_GLFW_VIEW -#define MBGL_COMMON_GLFW_VIEW +#pragma once #include #include @@ -90,5 +89,3 @@ private: GLFWwindow *window = nullptr; bool dirty = false; }; - -#endif diff --git a/include/mbgl/platform/default/headless_display.hpp b/include/mbgl/platform/default/headless_display.hpp index 80a0c31af..edcc90522 100644 --- a/include/mbgl/platform/default/headless_display.hpp +++ b/include/mbgl/platform/default/headless_display.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_COMMON_HEADLESS_DISPLAY -#define MBGL_COMMON_HEADLESS_DISPLAY +#pragma once #include @@ -21,5 +20,3 @@ public: }; } // namespace mbgl - -#endif diff --git a/include/mbgl/platform/default/headless_view.hpp b/include/mbgl/platform/default/headless_view.hpp index 9fbbdfd20..d787eb169 100644 --- a/include/mbgl/platform/default/headless_view.hpp +++ b/include/mbgl/platform/default/headless_view.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_COMMON_HEADLESS_VIEW -#define MBGL_COMMON_HEADLESS_VIEW +#pragma once #ifdef __APPLE__ #include @@ -85,5 +84,3 @@ private: }; } // namespace mbgl - -#endif diff --git a/include/mbgl/platform/default/settings_json.hpp b/include/mbgl/platform/default/settings_json.hpp index 707d05eb1..eb23b28bc 100644 --- a/include/mbgl/platform/default/settings_json.hpp +++ b/include/mbgl/platform/default/settings_json.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_JSON_SETTINGS -#define MBGL_JSON_SETTINGS +#pragma once #include @@ -23,5 +22,3 @@ public: }; } // namespace mbgl - -#endif diff --git a/include/mbgl/platform/event.hpp b/include/mbgl/platform/event.hpp index 8e3650838..0b3b79df6 100644 --- a/include/mbgl/platform/event.hpp +++ b/include/mbgl/platform/event.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_PLATFORM_EVENT -#define MBGL_PLATFORM_EVENT +#pragma once #include @@ -88,5 +87,3 @@ constexpr EventPermutation disabledEventPermutations[] = { }; } // namespace mbgl - -#endif diff --git a/include/mbgl/platform/log.hpp b/include/mbgl/platform/log.hpp index cd072c37d..48b9e3dc7 100644 --- a/include/mbgl/platform/log.hpp +++ b/include/mbgl/platform/log.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_PLATFORM_LOG -#define MBGL_PLATFORM_LOG +#pragma once #include @@ -79,5 +78,3 @@ private: }; } // namespace mbgl - -#endif diff --git a/include/mbgl/platform/platform.hpp b/include/mbgl/platform/platform.hpp index de2585874..59ba7f97f 100644 --- a/include/mbgl/platform/platform.hpp +++ b/include/mbgl/platform/platform.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_PLATFORM_PLATFORM -#define MBGL_PLATFORM_PLATFORM +#pragma once #include #include @@ -25,5 +24,3 @@ void showDebugImage(std::string name, const char *data, size_t width, size_t hei void showColorDebugImage(std::string name, const char *data, size_t logical_width, size_t logical_height, size_t width, size_t height); } // namespace platform } // namespace mbgl - -#endif diff --git a/include/mbgl/sprite/sprite_image.hpp b/include/mbgl/sprite/sprite_image.hpp index 4c375e58b..7900b90b6 100644 --- a/include/mbgl/sprite/sprite_image.hpp +++ b/include/mbgl/sprite/sprite_image.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_SPRITE_IMAGE -#define MBGL_SPRITE_IMAGE +#pragma once #include #include @@ -28,5 +27,3 @@ public: }; } // namespace mbgl - -#endif diff --git a/include/mbgl/storage/default_file_source.hpp b/include/mbgl/storage/default_file_source.hpp index 76d60fce7..e77befda1 100644 --- a/include/mbgl/storage/default_file_source.hpp +++ b/include/mbgl/storage/default_file_source.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_STORAGE_DEFAULT_FILE_SOURCE -#define MBGL_STORAGE_DEFAULT_FILE_SOURCE +#pragma once #include #include @@ -111,5 +110,3 @@ private: }; } // namespace mbgl - -#endif diff --git a/include/mbgl/storage/file_source.hpp b/include/mbgl/storage/file_source.hpp index e572776af..88e033618 100644 --- a/include/mbgl/storage/file_source.hpp +++ b/include/mbgl/storage/file_source.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_STORAGE_FILE_SOURCE -#define MBGL_STORAGE_FILE_SOURCE +#pragma once #include #include @@ -27,5 +26,3 @@ public: }; } // namespace mbgl - -#endif diff --git a/include/mbgl/storage/network_status.hpp b/include/mbgl/storage/network_status.hpp index d5ea13e07..d7f502a3b 100644 --- a/include/mbgl/storage/network_status.hpp +++ b/include/mbgl/storage/network_status.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_STORAGE_NETWORK_STATUS -#define MBGL_STORAGE_NETWORK_STATUS +#pragma once #include #include @@ -33,5 +32,3 @@ private: }; } // namespace mbgl - -#endif diff --git a/include/mbgl/storage/online_file_source.hpp b/include/mbgl/storage/online_file_source.hpp index fd742a54c..081beeeab 100644 --- a/include/mbgl/storage/online_file_source.hpp +++ b/include/mbgl/storage/online_file_source.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_STORAGE_ONLINE_FILE_SOURCE -#define MBGL_STORAGE_ONLINE_FILE_SOURCE +#pragma once #include @@ -24,5 +23,3 @@ private: }; } // namespace mbgl - -#endif diff --git a/include/mbgl/storage/resource.hpp b/include/mbgl/storage/resource.hpp index 01c2ee4e3..62ee54966 100644 --- a/include/mbgl/storage/resource.hpp +++ b/include/mbgl/storage/resource.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_STORAGE_RESOURCE -#define MBGL_STORAGE_RESOURCE +#pragma once #include #include @@ -68,5 +67,3 @@ public: }; } // namespace mbgl - -#endif diff --git a/include/mbgl/storage/response.hpp b/include/mbgl/storage/response.hpp index f140e42b0..83227573c 100644 --- a/include/mbgl/storage/response.hpp +++ b/include/mbgl/storage/response.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_STORAGE_RESPONSE -#define MBGL_STORAGE_RESPONSE +#pragma once #include #include @@ -56,5 +55,3 @@ public: std::ostream& operator<<(std::ostream&, Response::Error::Reason); } // namespace mbgl - -#endif diff --git a/include/mbgl/style/property_transition.hpp b/include/mbgl/style/property_transition.hpp index fa837f11a..b9a301fee 100644 --- a/include/mbgl/style/property_transition.hpp +++ b/include/mbgl/style/property_transition.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_STYLE_PROPERTY_TRANSITION -#define MBGL_STYLE_PROPERTY_TRANSITION +#pragma once #include #include @@ -16,5 +15,3 @@ public: }; } // namespace mbgl - -#endif // MBGL_STYLE_PROPERTY_TRANSITION diff --git a/include/mbgl/style/types.hpp b/include/mbgl/style/types.hpp index 9cad1071c..9b03ab8a2 100644 --- a/include/mbgl/style/types.hpp +++ b/include/mbgl/style/types.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_STYLE_TYPES -#define MBGL_STYLE_TYPES +#pragma once #include @@ -146,5 +145,3 @@ using CustomLayerDeinitializeFunction = void (*)(void* context); } // namespace mbgl -#endif - diff --git a/include/mbgl/util/chrono.hpp b/include/mbgl/util/chrono.hpp index 81f05d610..48460d337 100644 --- a/include/mbgl/util/chrono.hpp +++ b/include/mbgl/util/chrono.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_CHRONO -#define MBGL_UTIL_CHRONO +#pragma once #include #include @@ -42,5 +41,3 @@ constexpr std::chrono::duration abs(std::chrono::duration @@ -59,5 +58,3 @@ extern const bool shapingWarning; } // namespace debug } // namespace mbgl - -#endif diff --git a/include/mbgl/util/default_styles.hpp b/include/mbgl/util/default_styles.hpp index 05015ab4c..eb7e03472 100644 --- a/include/mbgl/util/default_styles.hpp +++ b/include/mbgl/util/default_styles.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_PLATFORM_DEFAULT_STYLES -#define MBGL_PLATFORM_DEFAULT_STYLES +#pragma once #include #include @@ -30,5 +29,3 @@ static const unsigned currentVersion = 9; } // end namespace default_styles } // end namespace util } // end namespace mbgl - -#endif diff --git a/include/mbgl/util/enum.hpp b/include/mbgl/util/enum.hpp index 5d64ed671..3fbf313ae 100644 --- a/include/mbgl/util/enum.hpp +++ b/include/mbgl/util/enum.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_ENUM -#define MBGL_UTIL_ENUM +#pragma once #include #include @@ -51,5 +50,3 @@ public: } // namespace mbgl -#endif - diff --git a/include/mbgl/util/exception.hpp b/include/mbgl/util/exception.hpp index b2214b36b..b73a94fcd 100644 --- a/include/mbgl/util/exception.hpp +++ b/include/mbgl/util/exception.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_EXCEPTION -#define MBGL_UTIL_EXCEPTION +#pragma once #include @@ -28,5 +27,3 @@ struct ShaderException : Exception { } // namespace util } // namespace mbgl - -#endif diff --git a/include/mbgl/util/geo.hpp b/include/mbgl/util/geo.hpp index 86274c1a7..7e15d5c2f 100644 --- a/include/mbgl/util/geo.hpp +++ b/include/mbgl/util/geo.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_GEO -#define MBGL_UTIL_GEO +#pragma once #include #include @@ -216,5 +215,3 @@ public: }; } // namespace mbgl - -#endif diff --git a/include/mbgl/util/image.hpp b/include/mbgl/util/image.hpp index a1c899d23..fbb0686a7 100644 --- a/include/mbgl/util/image.hpp +++ b/include/mbgl/util/image.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_IMAGE -#define MBGL_UTIL_IMAGE +#pragma once #include #include @@ -49,5 +48,3 @@ PremultipliedImage decodeImage(const std::string&); std::string encodePNG(const PremultipliedImage&); } // namespace mbgl - -#endif diff --git a/include/mbgl/util/noncopyable.hpp b/include/mbgl/util/noncopyable.hpp index 1789a36de..105a76a9a 100644 --- a/include/mbgl/util/noncopyable.hpp +++ b/include/mbgl/util/noncopyable.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_NONCOPYABLE -#define MBGL_UTIL_NONCOPYABLE +#pragma once namespace mbgl { namespace util { @@ -20,5 +19,3 @@ typedef non_copyable_::noncopyable noncopyable; } // namespace util } // namespace mbgl - -#endif diff --git a/include/mbgl/util/optional.hpp b/include/mbgl/util/optional.hpp index 1063ba84a..a9374a1b5 100644 --- a/include/mbgl/util/optional.hpp +++ b/include/mbgl/util/optional.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_OPTIONAL -#define MBGL_UTIL_OPTIONAL +#pragma once #include @@ -9,5 +8,3 @@ template using optional = std::experimental::optional; } // namespace mbgl - -#endif diff --git a/include/mbgl/util/projection.hpp b/include/mbgl/util/projection.hpp index cc1c39196..8e1c99465 100644 --- a/include/mbgl/util/projection.hpp +++ b/include/mbgl/util/projection.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_PROJECTION -#define MBGL_UTIL_PROJECTION +#pragma once #include #include @@ -42,5 +41,3 @@ public: }; } // namespace mbgl - -#endif diff --git a/include/mbgl/util/run_loop.hpp b/include/mbgl/util/run_loop.hpp index d3a61d418..9703fe7bc 100644 --- a/include/mbgl/util/run_loop.hpp +++ b/include/mbgl/util/run_loop.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_RUN_LOOP -#define MBGL_UTIL_RUN_LOOP +#pragma once #include #include @@ -182,5 +181,3 @@ private: } // namespace util } // namespace mbgl - -#endif diff --git a/include/mbgl/util/string.hpp b/include/mbgl/util/string.hpp index 5d3631e19..202554c3a 100644 --- a/include/mbgl/util/string.hpp +++ b/include/mbgl/util/string.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_STRING -#define MBGL_UTIL_STRING +#pragma once #include #include @@ -53,5 +52,3 @@ inline std::string toString(std::exception_ptr error) { } // namespace util } // namespace mbgl - -#endif diff --git a/include/mbgl/util/timer.hpp b/include/mbgl/util/timer.hpp index 783241847..7d76e3b79 100644 --- a/include/mbgl/util/timer.hpp +++ b/include/mbgl/util/timer.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_TIMER -#define MBGL_UTIL_TIMER +#pragma once #include #include @@ -25,5 +24,3 @@ private: } // namespace util } // namespace mbgl - -#endif diff --git a/include/mbgl/util/traits.hpp b/include/mbgl/util/traits.hpp index 812d9fb54..7c9499897 100644 --- a/include/mbgl/util/traits.hpp +++ b/include/mbgl/util/traits.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_TRAITS -#define MBGL_UTIL_TRAITS +#pragma once #include @@ -11,5 +10,3 @@ constexpr auto underlying_type(T t) -> typename std::underlying_type::type { } } // namespace mbgl - -#endif // MBGL_UTIL_TRAITS diff --git a/include/mbgl/util/unitbezier.hpp b/include/mbgl/util/unitbezier.hpp index ce34534d5..ce3e78f3c 100644 --- a/include/mbgl/util/unitbezier.hpp +++ b/include/mbgl/util/unitbezier.hpp @@ -23,8 +23,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef MBGL_UTIL_UNITBEZIER -#define MBGL_UTIL_UNITBEZIER +#pragma once #include @@ -117,5 +116,3 @@ private: } // namespace util } // namespace mbgl - -#endif diff --git a/include/mbgl/util/util.hpp b/include/mbgl/util/util.hpp index 2b0fd9cdd..df8613ab7 100644 --- a/include/mbgl/util/util.hpp +++ b/include/mbgl/util/util.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_UTIL -#define MBGL_UTIL_UTIL +#pragma once #ifdef DEBUG @@ -13,5 +12,3 @@ #define MBGL_VERIFY_THREAD(tid) #endif - -#endif diff --git a/include/mbgl/util/work_request.hpp b/include/mbgl/util/work_request.hpp index f24e4b2e9..5b051fc09 100644 --- a/include/mbgl/util/work_request.hpp +++ b/include/mbgl/util/work_request.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_WORK_REQUEST -#define MBGL_UTIL_WORK_REQUEST +#pragma once #include @@ -20,5 +19,3 @@ private: }; } // namespace mbgl - -#endif diff --git a/include/mbgl/util/work_task.hpp b/include/mbgl/util/work_task.hpp index a874625c8..43f4810b4 100644 --- a/include/mbgl/util/work_task.hpp +++ b/include/mbgl/util/work_task.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_WORK_TASK -#define MBGL_UTIL_WORK_TASK +#pragma once #include @@ -17,5 +16,3 @@ public: }; } // namespace mbgl - -#endif diff --git a/platform/android/src/jni.hpp b/platform/android/src/jni.hpp index c2f1f5481..57f84f0cc 100644 --- a/platform/android/src/jni.hpp +++ b/platform/android/src/jni.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_ANDROID_JNI -#define MBGL_ANDROID_JNI +#pragma once #include @@ -26,5 +25,3 @@ extern void detach_jni_thread(JavaVM* vm, JNIEnv** env, bool detach); } } - -#endif diff --git a/platform/android/src/native_map_view.hpp b/platform/android/src/native_map_view.hpp index 5bae79ad9..40cb012b0 100755 --- a/platform/android/src/native_map_view.hpp +++ b/platform/android/src/native_map_view.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_ANDROID_NATIVE_MAP_VIEW -#define MBGL_ANDROID_NATIVE_MAP_VIEW +#pragma once #include #include @@ -98,5 +97,3 @@ private: }; } } - -#endif diff --git a/platform/default/mbgl/storage/offline_database.hpp b/platform/default/mbgl/storage/offline_database.hpp index 06c44c80b..1706c6ba5 100644 --- a/platform/default/mbgl/storage/offline_database.hpp +++ b/platform/default/mbgl/storage/offline_database.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_OFFLINE_DATABASE -#define MBGL_OFFLINE_DATABASE +#pragma once #include #include @@ -111,5 +110,3 @@ private: }; } // namespace mbgl - -#endif diff --git a/platform/ios/benchmark/locations.hpp b/platform/ios/benchmark/locations.hpp index 96f9c6025..1ea65d628 100644 --- a/platform/ios/benchmark/locations.hpp +++ b/platform/ios/benchmark/locations.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_BENCH_LOCATIONS -#define MBGL_BENCH_LOCATIONS +#pragma once #include #include @@ -19,5 +18,3 @@ extern const std::vector locations; } } - -#endif \ No newline at end of file diff --git a/scripts/build-shaders.py b/scripts/build-shaders.py index 4cfb3cb38..228ba6511 100755 --- a/scripts/build-shaders.py +++ b/scripts/build-shaders.py @@ -18,10 +18,9 @@ shader_name, shader_type, extension = os.path.basename(input_file).split('.') with open(input_file, "r") as f: data = f.read() -content = """// NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED. +content = """#pragma once -#ifndef MBGL_SHADER_{NAME}_{TYPE} -#define MBGL_SHADER_{NAME}_{TYPE} +// NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED. #include @@ -38,8 +37,6 @@ constexpr const char* {type} = R"MBGL_SHADER(#version 120\n{data})MBGL_SHADER"; }} // namespace {name} }} // namespace shaders }} // namespace mbgl - -#endif """.format( name = shader_name, NAME = shader_name.upper(), diff --git a/scripts/build-version.py b/scripts/build-version.py index 1a01f6cd2..a39639007 100755 --- a/scripts/build-version.py +++ b/scripts/build-version.py @@ -44,8 +44,7 @@ else: rev = DEFAULT_REV header = """// NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED. -#ifndef MBGL_UTIL_VERSION -#define MBGL_UTIL_VERSION +#pragma once #define MBGL_VERSION 0x{major:02x}{minor:02x}{patch:02x} #define MBGL_VERSION_STRING "{major}.{minor}.{patch}" @@ -62,10 +61,8 @@ extern const char *revision; extern const char *string; extern const unsigned int number; -}} -}} - -#endif +}} // namespace mbgl +}} // namespace version """.format( major = tag[0], minor = tag[1], diff --git a/src/mbgl/algorithm/covered_by_children.hpp b/src/mbgl/algorithm/covered_by_children.hpp index 766a67aca..ad2f1dd5d 100644 --- a/src/mbgl/algorithm/covered_by_children.hpp +++ b/src/mbgl/algorithm/covered_by_children.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_ALGORITHM_COVERED_BY_CHILDREN -#define MBGL_ALGORITHM_COVERED_BY_CHILDREN +#pragma once #include @@ -30,5 +29,3 @@ bool coveredByChildren(const UnwrappedTileID& id, const Container& container) { } // namespace algorithm } // namespace mbgl - -#endif \ No newline at end of file diff --git a/src/mbgl/algorithm/generate_clip_ids.hpp b/src/mbgl/algorithm/generate_clip_ids.hpp index 8b06354d4..0454c9952 100644 --- a/src/mbgl/algorithm/generate_clip_ids.hpp +++ b/src/mbgl/algorithm/generate_clip_ids.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_ALGORITHM_GENERATE_CLIP_IDS -#define MBGL_ALGORITHM_GENERATE_CLIP_IDS +#pragma once #include #include @@ -34,5 +33,3 @@ public: } // namespace algorithm } // namespace mbgl - -#endif diff --git a/src/mbgl/algorithm/generate_clip_ids_impl.hpp b/src/mbgl/algorithm/generate_clip_ids_impl.hpp index 479061b6c..ff8f8d3fd 100644 --- a/src/mbgl/algorithm/generate_clip_ids_impl.hpp +++ b/src/mbgl/algorithm/generate_clip_ids_impl.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_ALGORITHM_GENERATE_CLIP_IDS_IMPL -#define MBGL_ALGORITHM_GENERATE_CLIP_IDS_IMPL +#pragma once #include #include @@ -77,5 +76,3 @@ void ClipIDGenerator::update(Renderables& renderables) { } // namespace algorithm } // namespace mbgl - -#endif diff --git a/src/mbgl/algorithm/update_renderables.hpp b/src/mbgl/algorithm/update_renderables.hpp index a1fa6b1e6..898f9e68d 100644 --- a/src/mbgl/algorithm/update_renderables.hpp +++ b/src/mbgl/algorithm/update_renderables.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_ALGORITHM_UPDATE_RENDERABLES -#define MBGL_ALGORITHM_UPDATE_RENDERABLES +#pragma once #include @@ -11,5 +10,3 @@ void updateRenderables(Layer& layer, const uint8_t z); } // namespace algorithm } // namespace mbgl - -#endif diff --git a/src/mbgl/algorithm/update_renderables_impl.hpp b/src/mbgl/algorithm/update_renderables_impl.hpp index d7221be21..6ec944a85 100644 --- a/src/mbgl/algorithm/update_renderables_impl.hpp +++ b/src/mbgl/algorithm/update_renderables_impl.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_ALGORITHM_UPDATE_RENDERABLES_IMPL -#define MBGL_ALGORITHM_UPDATE_RENDERABLES_IMPL +#pragma once #include #include @@ -89,5 +88,3 @@ std::map updateRenderables(const DataTiles& dataTil } // namespace algorithm } // namespace mbgl - -#endif diff --git a/src/mbgl/annotation/annotation_manager.hpp b/src/mbgl/annotation/annotation_manager.hpp index 4563a4a95..aaa60278c 100644 --- a/src/mbgl/annotation/annotation_manager.hpp +++ b/src/mbgl/annotation/annotation_manager.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_ANNOTATION_MANAGER -#define MBGL_ANNOTATION_MANAGER +#pragma once #include #include @@ -61,5 +60,3 @@ private: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/annotation/annotation_tile.hpp b/src/mbgl/annotation/annotation_tile.hpp index 0e3b19e07..5943eb11c 100644 --- a/src/mbgl/annotation/annotation_tile.hpp +++ b/src/mbgl/annotation/annotation_tile.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_ANNOTATION_TILE -#define MBGL_ANNOTATION_TILE +#pragma once #include #include @@ -57,5 +56,3 @@ private: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/annotation/point_annotation_impl.hpp b/src/mbgl/annotation/point_annotation_impl.hpp index cf341f125..d8852fca9 100644 --- a/src/mbgl/annotation/point_annotation_impl.hpp +++ b/src/mbgl/annotation/point_annotation_impl.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_POINT_ANNOTATION_IMPL -#define MBGL_POINT_ANNOTATION_IMPL +#pragma once #include #include @@ -68,5 +67,3 @@ struct indexable> { } // end namespace index } // end namespace geometry } // end namespace boost - -#endif diff --git a/src/mbgl/annotation/shape_annotation_impl.hpp b/src/mbgl/annotation/shape_annotation_impl.hpp index d745dd129..fb3ef2d89 100644 --- a/src/mbgl/annotation/shape_annotation_impl.hpp +++ b/src/mbgl/annotation/shape_annotation_impl.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_SHAPE_ANNOTATION_IMPL -#define MBGL_SHAPE_ANNOTATION_IMPL +#pragma once #include @@ -37,5 +36,3 @@ private: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/geometry/anchor.hpp b/src/mbgl/geometry/anchor.hpp index 0dd252216..9bc979343 100644 --- a/src/mbgl/geometry/anchor.hpp +++ b/src/mbgl/geometry/anchor.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_GEOMETRY_ANCHOR -#define MBGL_GEOMETRY_ANCHOR +#pragma once #include @@ -23,5 +22,3 @@ struct Anchor { typedef std::vector Anchors; } // namespace mbgl - -#endif diff --git a/src/mbgl/geometry/binpack.hpp b/src/mbgl/geometry/binpack.hpp index 706115a20..b715cbc2b 100644 --- a/src/mbgl/geometry/binpack.hpp +++ b/src/mbgl/geometry/binpack.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_GEOMETRY_BINPACK -#define MBGL_GEOMETRY_BINPACK +#pragma once #include #include @@ -100,5 +99,3 @@ private: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/geometry/buffer.hpp b/src/mbgl/geometry/buffer.hpp index e20511326..e8e2788f5 100644 --- a/src/mbgl/geometry/buffer.hpp +++ b/src/mbgl/geometry/buffer.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_GEOMETRY_BUFFER -#define MBGL_GEOMETRY_BUFFER +#pragma once #include #include @@ -119,5 +118,3 @@ private: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/geometry/circle_buffer.hpp b/src/mbgl/geometry/circle_buffer.hpp index 30e339bb6..2b188c400 100644 --- a/src/mbgl/geometry/circle_buffer.hpp +++ b/src/mbgl/geometry/circle_buffer.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_GEOMETRY_CIRCLE_BUFFER -#define MBGL_GEOMETRY_CIRCLE_BUFFER +#pragma once #include @@ -23,5 +22,3 @@ public: }; } // namespace mbgl - -#endif // MBGL_GEOMETRY_CIRCLE_BUFFER diff --git a/src/mbgl/geometry/collision_box_buffer.hpp b/src/mbgl/geometry/collision_box_buffer.hpp index 44a0f164b..b2756dd97 100644 --- a/src/mbgl/geometry/collision_box_buffer.hpp +++ b/src/mbgl/geometry/collision_box_buffer.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_GEOMETRY_COLLISIONBOX_BUFFER -#define MBGL_GEOMETRY_COLLISIONBOX_BUFFER +#pragma once #include #include @@ -19,5 +18,3 @@ public: } // namespace mbgl - -#endif diff --git a/src/mbgl/geometry/debug_font_buffer.hpp b/src/mbgl/geometry/debug_font_buffer.hpp index 904360ee8..f2debe97a 100644 --- a/src/mbgl/geometry/debug_font_buffer.hpp +++ b/src/mbgl/geometry/debug_font_buffer.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_GEOMETRY_DEBUG_FONT_BUFFER -#define MBGL_GEOMETRY_DEBUG_FONT_BUFFER +#pragma once #include @@ -13,5 +12,3 @@ public: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/geometry/elements_buffer.hpp b/src/mbgl/geometry/elements_buffer.hpp index ce716dfaf..5fdff0c67 100644 --- a/src/mbgl/geometry/elements_buffer.hpp +++ b/src/mbgl/geometry/elements_buffer.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_GEOMETRY_TRIANGLE_ELEMENTS_BUFFER -#define MBGL_GEOMETRY_TRIANGLE_ELEMENTS_BUFFER +#pragma once #include #include @@ -45,5 +44,3 @@ public: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/geometry/feature_index.hpp b/src/mbgl/geometry/feature_index.hpp index a0afbb885..0dcc154f0 100644 --- a/src/mbgl/geometry/feature_index.hpp +++ b/src/mbgl/geometry/feature_index.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_GEOMETRY_FEATURE_INDEX -#define MBGL_GEOMETRY_FEATURE_INDEX +#pragma once #include #include @@ -72,5 +71,3 @@ private: std::unordered_map> bucketLayerIDs; }; } - -#endif diff --git a/src/mbgl/geometry/fill_buffer.hpp b/src/mbgl/geometry/fill_buffer.hpp index 531dcf82f..a180d9c5a 100644 --- a/src/mbgl/geometry/fill_buffer.hpp +++ b/src/mbgl/geometry/fill_buffer.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_GEOMETRY_FILL_BUFFER -#define MBGL_GEOMETRY_FILL_BUFFER +#pragma once #include #include @@ -17,5 +16,3 @@ public: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/geometry/glyph_atlas.hpp b/src/mbgl/geometry/glyph_atlas.hpp index df1446cd4..20ba5890e 100644 --- a/src/mbgl/geometry/glyph_atlas.hpp +++ b/src/mbgl/geometry/glyph_atlas.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_GEOMETRY_GLYPH_ATLAS -#define MBGL_GEOMETRY_GLYPH_ATLAS +#pragma once #include #include @@ -58,5 +57,3 @@ private: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/geometry/icon_buffer.hpp b/src/mbgl/geometry/icon_buffer.hpp index d3c3999ee..011668626 100644 --- a/src/mbgl/geometry/icon_buffer.hpp +++ b/src/mbgl/geometry/icon_buffer.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_GEOMETRY_ICON_BUFFER -#define MBGL_GEOMETRY_ICON_BUFFER +#pragma once #include @@ -16,5 +15,3 @@ namespace mbgl { }; } // namespace mbgl - -#endif diff --git a/src/mbgl/geometry/line_atlas.hpp b/src/mbgl/geometry/line_atlas.hpp index e94b39945..15eb41541 100644 --- a/src/mbgl/geometry/line_atlas.hpp +++ b/src/mbgl/geometry/line_atlas.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_GEOMETRY_LINE_ATLAS -#define MBGL_GEOMETRY_LINE_ATLAS +#pragma once #include #include @@ -42,5 +41,3 @@ private: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/geometry/line_buffer.hpp b/src/mbgl/geometry/line_buffer.hpp index aa2dedbce..5511b009a 100644 --- a/src/mbgl/geometry/line_buffer.hpp +++ b/src/mbgl/geometry/line_buffer.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_GEOMETRY_LINE_BUFFER -#define MBGL_GEOMETRY_LINE_BUFFER +#pragma once #include @@ -36,5 +35,3 @@ public: } // namespace mbgl - -#endif diff --git a/src/mbgl/geometry/static_vertex_buffer.hpp b/src/mbgl/geometry/static_vertex_buffer.hpp index eaf05b44d..79f6117cb 100644 --- a/src/mbgl/geometry/static_vertex_buffer.hpp +++ b/src/mbgl/geometry/static_vertex_buffer.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_GEOMETRY_STATIC_VERTEX_BUFFER -#define MBGL_GEOMETRY_STATIC_VERTEX_BUFFER +#pragma once #include @@ -22,5 +21,3 @@ public: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/geometry/text_buffer.hpp b/src/mbgl/geometry/text_buffer.hpp index 5a20d463b..8d7859fde 100644 --- a/src/mbgl/geometry/text_buffer.hpp +++ b/src/mbgl/geometry/text_buffer.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_GEOMETRY_TEXT_BUFFER -#define MBGL_GEOMETRY_TEXT_BUFFER +#pragma once #include #include @@ -19,5 +18,3 @@ public: } // namespace mbgl - -#endif diff --git a/src/mbgl/geometry/vao.hpp b/src/mbgl/geometry/vao.hpp index dcb66dd41..8e9e417c1 100644 --- a/src/mbgl/geometry/vao.hpp +++ b/src/mbgl/geometry/vao.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_GEOMETRY_VAO -#define MBGL_GEOMETRY_VAO +#pragma once #include #include @@ -69,5 +68,3 @@ private: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/gl/debugging.hpp b/src/mbgl/gl/debugging.hpp index 532185862..b51b5dafe 100644 --- a/src/mbgl/gl/debugging.hpp +++ b/src/mbgl/gl/debugging.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_GL_DEBUG_MESSAGES -#define MBGL_GL_DEBUG_MESSAGES +#pragma once #include @@ -25,5 +24,3 @@ struct group { } // namespace debugging } // namespace gl } // namespace mbgl - -#endif diff --git a/src/mbgl/gl/gl_config.hpp b/src/mbgl/gl/gl_config.hpp index 62dfbcadc..7b42c7829 100644 --- a/src/mbgl/gl/gl_config.hpp +++ b/src/mbgl/gl/gl_config.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_GL_GL_CONFIG -#define MBGL_GL_GL_CONFIG +#pragma once #include #include @@ -111,5 +110,3 @@ public: } // namespace gl } // namespace mbgl - -#endif // MBGL_RENDERER_GL_CONFIG diff --git a/src/mbgl/gl/gl_object_store.hpp b/src/mbgl/gl/gl_object_store.hpp index 832f1d09b..b30abd389 100644 --- a/src/mbgl/gl/gl_object_store.hpp +++ b/src/mbgl/gl/gl_object_store.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_MAP_UTIL_GL_OBJECT_STORE -#define MBGL_MAP_UTIL_GL_OBJECT_STORE +#pragma once #include #include @@ -137,5 +136,3 @@ public: } // namespace gl } // namespace mbgl - -#endif diff --git a/src/mbgl/gl/texture_pool.hpp b/src/mbgl/gl/texture_pool.hpp index 10f63bfac..10894f146 100644 --- a/src/mbgl/gl/texture_pool.hpp +++ b/src/mbgl/gl/texture_pool.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_TEXTUREPOOL -#define MBGL_UTIL_TEXTUREPOOL +#pragma once #include #include @@ -37,5 +36,3 @@ private: } // namespace gl } // namespace mbgl - -#endif diff --git a/src/mbgl/layer/background_layer.hpp b/src/mbgl/layer/background_layer.hpp index fb9f8b714..39142a3bd 100644 --- a/src/mbgl/layer/background_layer.hpp +++ b/src/mbgl/layer/background_layer.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_BACKGROUND_LAYER -#define MBGL_BACKGROUND_LAYER +#pragma once #include #include @@ -35,5 +34,3 @@ inline bool StyleLayer::is() const { } } // namespace mbgl - -#endif diff --git a/src/mbgl/layer/circle_layer.hpp b/src/mbgl/layer/circle_layer.hpp index 6a6f4ed52..543bae8f1 100644 --- a/src/mbgl/layer/circle_layer.hpp +++ b/src/mbgl/layer/circle_layer.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_CIRCLE_LAYER -#define MBGL_CIRCLE_LAYER +#pragma once #include #include @@ -45,5 +44,3 @@ inline bool StyleLayer::is() const { } } // namespace mbgl - -#endif diff --git a/src/mbgl/layer/custom_layer.hpp b/src/mbgl/layer/custom_layer.hpp index b54ac7481..93d9c85e6 100644 --- a/src/mbgl/layer/custom_layer.hpp +++ b/src/mbgl/layer/custom_layer.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_CUSTOM_LAYER -#define MBGL_CUSTOM_LAYER +#pragma once #include @@ -44,5 +43,3 @@ inline bool StyleLayer::is() const { } } // namespace mbgl - -#endif diff --git a/src/mbgl/layer/fill_layer.hpp b/src/mbgl/layer/fill_layer.hpp index 880cbe14a..eb8a50723 100644 --- a/src/mbgl/layer/fill_layer.hpp +++ b/src/mbgl/layer/fill_layer.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_FILL_LAYER -#define MBGL_FILL_LAYER +#pragma once #include #include @@ -46,5 +45,3 @@ inline bool StyleLayer::is() const { } } // namespace mbgl - -#endif diff --git a/src/mbgl/layer/line_layer.hpp b/src/mbgl/layer/line_layer.hpp index 00c8805e5..60bd9fad5 100644 --- a/src/mbgl/layer/line_layer.hpp +++ b/src/mbgl/layer/line_layer.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_LINE_LAYER -#define MBGL_LINE_LAYER +#pragma once #include #include @@ -63,5 +62,3 @@ inline bool StyleLayer::is() const { } } // namespace mbgl - -#endif diff --git a/src/mbgl/layer/raster_layer.hpp b/src/mbgl/layer/raster_layer.hpp index 1acf8f568..d473505d5 100644 --- a/src/mbgl/layer/raster_layer.hpp +++ b/src/mbgl/layer/raster_layer.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_RASTER_LAYER -#define MBGL_RASTER_LAYER +#pragma once #include #include @@ -39,5 +38,3 @@ inline bool StyleLayer::is() const { } } // namespace mbgl - -#endif diff --git a/src/mbgl/layer/symbol_layer.hpp b/src/mbgl/layer/symbol_layer.hpp index f8e42ab82..3119ee1f0 100644 --- a/src/mbgl/layer/symbol_layer.hpp +++ b/src/mbgl/layer/symbol_layer.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_SYMBOL_LAYER -#define MBGL_SYMBOL_LAYER +#pragma once #include #include @@ -93,5 +92,3 @@ inline bool StyleLayer::is() const { } } // namespace mbgl - -#endif diff --git a/src/mbgl/map/change.hpp b/src/mbgl/map/change.hpp index 01adc497d..483ce8289 100644 --- a/src/mbgl/map/change.hpp +++ b/src/mbgl/map/change.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_MAP_CHANGE -#define MBGL_MAP_CHANGE +#pragma once #include @@ -23,5 +22,3 @@ enum MapChange : uint8_t { }; } // namespace mbgl - -#endif diff --git a/src/mbgl/map/transform.hpp b/src/mbgl/map/transform.hpp index 8752af9b4..904ed1139 100644 --- a/src/mbgl/map/transform.hpp +++ b/src/mbgl/map/transform.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_MAP_TRANSFORM -#define MBGL_MAP_TRANSFORM +#pragma once #include #include @@ -180,5 +179,3 @@ private: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/map/transform_state.hpp b/src/mbgl/map/transform_state.hpp index 438094a4c..0489b69dd 100644 --- a/src/mbgl/map/transform_state.hpp +++ b/src/mbgl/map/transform_state.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_MAP_TRANSFORM_STATE -#define MBGL_MAP_TRANSFORM_STATE +#pragma once #include #include @@ -122,5 +121,3 @@ private: }; } // namespace mbgl - -#endif // MBGL_MAP_TRANSFORM_STATE diff --git a/src/mbgl/renderer/bucket.hpp b/src/mbgl/renderer/bucket.hpp index 0a4853ad9..d7286b0b4 100644 --- a/src/mbgl/renderer/bucket.hpp +++ b/src/mbgl/renderer/bucket.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_RENDERER_BUCKET -#define MBGL_RENDERER_BUCKET +#pragma once #include #include @@ -53,5 +52,3 @@ protected: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/renderer/circle_bucket.hpp b/src/mbgl/renderer/circle_bucket.hpp index abfca851e..681334f8a 100644 --- a/src/mbgl/renderer/circle_bucket.hpp +++ b/src/mbgl/renderer/circle_bucket.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_RENDERER_CIRCLE_BUCKET -#define MBGL_RENDERER_CIRCLE_BUCKET +#pragma once #include #include @@ -38,5 +37,3 @@ private: }; } // namespace mbgl - -#endif // MBGL_RENDERER_CIRCLE_BUCKET diff --git a/src/mbgl/renderer/debug_bucket.hpp b/src/mbgl/renderer/debug_bucket.hpp index f26b7b79e..a5262ab1b 100644 --- a/src/mbgl/renderer/debug_bucket.hpp +++ b/src/mbgl/renderer/debug_bucket.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_RENDERER_DEBUGBUCKET -#define MBGL_RENDERER_DEBUGBUCKET +#pragma once #include #include @@ -36,5 +35,3 @@ private: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/renderer/fill_bucket.hpp b/src/mbgl/renderer/fill_bucket.hpp index aefb178c4..e8ef8cc67 100644 --- a/src/mbgl/renderer/fill_bucket.hpp +++ b/src/mbgl/renderer/fill_bucket.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_RENDERER_FILLBUCKET -#define MBGL_RENDERER_FILLBUCKET +#pragma once #include #include @@ -67,5 +66,3 @@ private: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/renderer/frame_history.hpp b/src/mbgl/renderer/frame_history.hpp index 88c58d74a..c523a8531 100644 --- a/src/mbgl/renderer/frame_history.hpp +++ b/src/mbgl/renderer/frame_history.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_RENDERER_FRAME_HISTORY -#define MBGL_RENDERER_FRAME_HISTORY +#pragma once #include @@ -36,5 +35,3 @@ private: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/renderer/line_bucket.hpp b/src/mbgl/renderer/line_bucket.hpp index 87d95586c..8c9e38fb3 100644 --- a/src/mbgl/renderer/line_bucket.hpp +++ b/src/mbgl/renderer/line_bucket.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_RENDERER_LINEBUCKET -#define MBGL_RENDERER_LINEBUCKET +#pragma once #include #include @@ -67,5 +66,3 @@ private: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/renderer/painter.hpp b/src/mbgl/renderer/painter.hpp index 9b5ef75c5..ee069b0a4 100644 --- a/src/mbgl/renderer/painter.hpp +++ b/src/mbgl/renderer/painter.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_RENDERER_PAINTER -#define MBGL_RENDERER_PAINTER +#pragma once #include @@ -242,5 +241,3 @@ private: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/renderer/raster_bucket.hpp b/src/mbgl/renderer/raster_bucket.hpp index 6fe21f3e9..da503dee0 100644 --- a/src/mbgl/renderer/raster_bucket.hpp +++ b/src/mbgl/renderer/raster_bucket.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_RENDERER_RASTERBUCKET -#define MBGL_RENDERER_RASTERBUCKET +#pragma once #include #include @@ -27,5 +26,3 @@ public: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/renderer/render_pass.hpp b/src/mbgl/renderer/render_pass.hpp index d3b60d066..e31383b7c 100644 --- a/src/mbgl/renderer/render_pass.hpp +++ b/src/mbgl/renderer/render_pass.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_RENDERER_RENDER_PASS -#define MBGL_RENDERER_RENDER_PASS +#pragma once #include @@ -26,5 +25,3 @@ constexpr inline RenderPass operator&(RenderPass a, RenderPass b) { } } // namespace mbgl - -#endif diff --git a/src/mbgl/renderer/renderable.hpp b/src/mbgl/renderer/renderable.hpp index 3d46fbd0b..27acfc4d0 100644 --- a/src/mbgl/renderer/renderable.hpp +++ b/src/mbgl/renderer/renderable.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_RENDERER_RENDERABLE -#define MBGL_RENDERER_RENDERABLE +#pragma once #include @@ -10,5 +9,3 @@ struct Renderable { }; } // namespace mbgl - -#endif diff --git a/src/mbgl/renderer/symbol_bucket.hpp b/src/mbgl/renderer/symbol_bucket.hpp index 8581a2357..520989ac3 100644 --- a/src/mbgl/renderer/symbol_bucket.hpp +++ b/src/mbgl/renderer/symbol_bucket.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_RENDERER_SYMBOLBUCKET -#define MBGL_RENDERER_SYMBOLBUCKET +#pragma once #include #include @@ -157,5 +156,3 @@ private: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/shader/box_shader.hpp b/src/mbgl/shader/box_shader.hpp index f3015b73a..5867a4896 100644 --- a/src/mbgl/shader/box_shader.hpp +++ b/src/mbgl/shader/box_shader.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_SHADER_SHADER_BOX -#define MBGL_SHADER_SHADER_BOX +#pragma once #include #include @@ -24,5 +23,3 @@ protected: }; } // namespace mbgl - -#endif // MBGL_SHADER_BOX_SHADER diff --git a/src/mbgl/shader/circle_shader.hpp b/src/mbgl/shader/circle_shader.hpp index a28bf3c6a..6e3cbacc6 100644 --- a/src/mbgl/shader/circle_shader.hpp +++ b/src/mbgl/shader/circle_shader.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_SHADER_CIRCLE_SHADER -#define MBGL_SHADER_CIRCLE_SHADER +#pragma once #include #include @@ -20,5 +19,3 @@ public: }; } // namespace mbgl - -#endif // MBGL_SHADER_CIRCLE_SHADER diff --git a/src/mbgl/shader/dot_shader.hpp b/src/mbgl/shader/dot_shader.hpp index a015310a6..99cf2b92d 100644 --- a/src/mbgl/shader/dot_shader.hpp +++ b/src/mbgl/shader/dot_shader.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_SHADER_SHADER_DOT -#define MBGL_SHADER_SHADER_DOT +#pragma once #include #include @@ -19,5 +18,3 @@ public: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/shader/icon_shader.hpp b/src/mbgl/shader/icon_shader.hpp index a7dcfe7a7..6e52f48aa 100644 --- a/src/mbgl/shader/icon_shader.hpp +++ b/src/mbgl/shader/icon_shader.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_SHADER_SHADER_ICON -#define MBGL_SHADER_SHADER_ICON +#pragma once #include #include @@ -29,5 +28,3 @@ protected: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/shader/line_shader.hpp b/src/mbgl/shader/line_shader.hpp index 1a9598f92..54bdee3f3 100644 --- a/src/mbgl/shader/line_shader.hpp +++ b/src/mbgl/shader/line_shader.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_SHADER_SHADER_LINE -#define MBGL_SHADER_SHADER_LINE +#pragma once #include #include @@ -28,5 +27,3 @@ private: } // namespace mbgl - -#endif diff --git a/src/mbgl/shader/linepattern_shader.hpp b/src/mbgl/shader/linepattern_shader.hpp index cbab2f9c4..98280af97 100644 --- a/src/mbgl/shader/linepattern_shader.hpp +++ b/src/mbgl/shader/linepattern_shader.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_SHADER_SHADER_LINEPATTERN -#define MBGL_SHADER_SHADER_LINEPATTERN +#pragma once #include #include @@ -35,5 +34,3 @@ private: GLint a_data = -1; }; } // namespace mbgl - -#endif diff --git a/src/mbgl/shader/linesdf_shader.hpp b/src/mbgl/shader/linesdf_shader.hpp index 8ac0aa579..ec271f175 100644 --- a/src/mbgl/shader/linesdf_shader.hpp +++ b/src/mbgl/shader/linesdf_shader.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_SHADER_SHADER_LINESDF -#define MBGL_SHADER_SHADER_LINESDF +#pragma once #include #include @@ -35,5 +34,3 @@ private: } // namespace mbgl - -#endif diff --git a/src/mbgl/shader/outline_shader.hpp b/src/mbgl/shader/outline_shader.hpp index 800461bf0..8128dbca5 100644 --- a/src/mbgl/shader/outline_shader.hpp +++ b/src/mbgl/shader/outline_shader.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_SHADER_SHADER_OUTLINE -#define MBGL_SHADER_SHADER_OUTLINE +#pragma once #include #include @@ -18,5 +17,3 @@ public: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/shader/outlinepattern_shader.hpp b/src/mbgl/shader/outlinepattern_shader.hpp index eed3839fd..c0fc5242d 100644 --- a/src/mbgl/shader/outlinepattern_shader.hpp +++ b/src/mbgl/shader/outlinepattern_shader.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_SHADER_SHADER_OUTLINEPATTERN -#define MBGL_SHADER_SHADER_OUTLINEPATTERN +#pragma once #include #include @@ -28,5 +27,3 @@ public: }; } // namespace mbgl - -#endif \ No newline at end of file diff --git a/src/mbgl/shader/pattern_shader.hpp b/src/mbgl/shader/pattern_shader.hpp index 0898dc0b8..b0d075247 100644 --- a/src/mbgl/shader/pattern_shader.hpp +++ b/src/mbgl/shader/pattern_shader.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_SHADER_SHADER_PATTERN -#define MBGL_SHADER_SHADER_PATTERN +#pragma once #include #include @@ -27,5 +26,3 @@ public: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/shader/plain_shader.hpp b/src/mbgl/shader/plain_shader.hpp index 34ee4dcdf..5aecde9b4 100644 --- a/src/mbgl/shader/plain_shader.hpp +++ b/src/mbgl/shader/plain_shader.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_SHADER_SHADER_PLAIN -#define MBGL_SHADER_SHADER_PLAIN +#pragma once #include #include @@ -17,5 +16,3 @@ public: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/shader/raster_shader.hpp b/src/mbgl/shader/raster_shader.hpp index 6a2e2ecf3..0e445d5cc 100644 --- a/src/mbgl/shader/raster_shader.hpp +++ b/src/mbgl/shader/raster_shader.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_RENDERER_SHADER_RASTER -#define MBGL_RENDERER_SHADER_RASTER +#pragma once #include #include @@ -24,5 +23,3 @@ public: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/shader/sdf_shader.hpp b/src/mbgl/shader/sdf_shader.hpp index 5fe6a4437..a33ee5e4d 100644 --- a/src/mbgl/shader/sdf_shader.hpp +++ b/src/mbgl/shader/sdf_shader.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_SHADER_SDF_SHADER -#define MBGL_SHADER_SDF_SHADER +#pragma once #include #include @@ -40,5 +39,3 @@ public: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/shader/shader.hpp b/src/mbgl/shader/shader.hpp index b543f73a6..fd000e9cd 100644 --- a/src/mbgl/shader/shader.hpp +++ b/src/mbgl/shader/shader.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_RENDERER_SHADER -#define MBGL_RENDERER_SHADER +#pragma once #include #include @@ -32,5 +31,3 @@ private: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/shader/uniform.hpp b/src/mbgl/shader/uniform.hpp index 5c4a2b14c..fd7e8797b 100644 --- a/src/mbgl/shader/uniform.hpp +++ b/src/mbgl/shader/uniform.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_SHADER_UNIFORM -#define MBGL_SHADER_UNIFORM +#pragma once #include #include @@ -59,5 +58,3 @@ private: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/source/source.hpp b/src/mbgl/source/source.hpp index 4da653d9a..cbdf4afa1 100644 --- a/src/mbgl/source/source.hpp +++ b/src/mbgl/source/source.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_MAP_SOURCE -#define MBGL_MAP_SOURCE +#pragma once #include #include @@ -108,5 +107,3 @@ private: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/source/source_info.hpp b/src/mbgl/source/source_info.hpp index ceae8ef8a..dc79695dc 100644 --- a/src/mbgl/source/source_info.hpp +++ b/src/mbgl/source/source_info.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_MAP_SOURCE_INFO -#define MBGL_MAP_SOURCE_INFO +#pragma once #include #include @@ -26,5 +25,3 @@ public: }; } // namespace mbgl - -#endif // MBGL_MAP_SOURCE_INFO diff --git a/src/mbgl/source/source_observer.hpp b/src/mbgl/source/source_observer.hpp index 82d5a8872..828e562a3 100644 --- a/src/mbgl/source/source_observer.hpp +++ b/src/mbgl/source/source_observer.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_MAP_SOURCE_OBSERVER -#define MBGL_MAP_SOURCE_OBSERVER +#pragma once #include @@ -20,5 +19,3 @@ public: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/sprite/sprite_atlas.hpp b/src/mbgl/sprite/sprite_atlas.hpp index ba592c5ac..891f48fa2 100644 --- a/src/mbgl/sprite/sprite_atlas.hpp +++ b/src/mbgl/sprite/sprite_atlas.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_SPRITE_ATLAS -#define MBGL_SPRITE_ATLAS +#pragma once #include #include @@ -101,5 +100,3 @@ private: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/sprite/sprite_parser.hpp b/src/mbgl/sprite/sprite_parser.hpp index 3244b6e4c..6a564ce33 100644 --- a/src/mbgl/sprite/sprite_parser.hpp +++ b/src/mbgl/sprite/sprite_parser.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_SPRITE_PARSER -#define MBGL_SPRITE_PARSER +#pragma once #include #include @@ -36,5 +35,3 @@ using SpriteParseResult = variant< SpriteParseResult parseSprite(const std::string& image, const std::string& json); } // namespace mbgl - -#endif diff --git a/src/mbgl/sprite/sprite_store.hpp b/src/mbgl/sprite/sprite_store.hpp index 50f74e174..c6f34d6c5 100644 --- a/src/mbgl/sprite/sprite_store.hpp +++ b/src/mbgl/sprite/sprite_store.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_SPRITE_STORE -#define MBGL_SPRITE_STORE +#pragma once #include #include @@ -69,5 +68,3 @@ private: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/sprite/sprite_store_observer.hpp b/src/mbgl/sprite/sprite_store_observer.hpp index 66d9d3790..32ce040aa 100644 --- a/src/mbgl/sprite/sprite_store_observer.hpp +++ b/src/mbgl/sprite/sprite_store_observer.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_SPRITE_STORE_OBSERVER -#define MBGL_SPRITE_STORE_OBSERVER +#pragma once #include @@ -14,5 +13,3 @@ public: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/storage/asset_file_source.hpp b/src/mbgl/storage/asset_file_source.hpp index f6c11c176..71e5bbdab 100644 --- a/src/mbgl/storage/asset_file_source.hpp +++ b/src/mbgl/storage/asset_file_source.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_STORAGE_ASSET_FILE_SOURCE -#define MBGL_STORAGE_ASSET_FILE_SOURCE +#pragma once #include @@ -22,5 +21,3 @@ private: }; } // namespace mbgl - -#endif // MBGL_STORAGE_ASSET_FILE_SOURCE diff --git a/src/mbgl/storage/http_file_source.hpp b/src/mbgl/storage/http_file_source.hpp index 60d37f1a1..47976f972 100644 --- a/src/mbgl/storage/http_file_source.hpp +++ b/src/mbgl/storage/http_file_source.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_STORAGE_HTTP_FILE_SOURCE -#define MBGL_STORAGE_HTTP_FILE_SOURCE +#pragma once #include @@ -21,5 +20,3 @@ private: }; } // namespace mbgl - -#endif // MBGL_STORAGE_HTTP_FILE_SOURCE diff --git a/src/mbgl/style/class_dictionary.hpp b/src/mbgl/style/class_dictionary.hpp index 8a06a77c7..703e27b43 100644 --- a/src/mbgl/style/class_dictionary.hpp +++ b/src/mbgl/style/class_dictionary.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_STYLE_CLASS_DICTIONARY -#define MBGL_STYLE_CLASS_DICTIONARY +#pragma once #include #include @@ -33,5 +32,3 @@ private: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/style/function.hpp b/src/mbgl/style/function.hpp index c5de6b5db..a04fc8bb4 100644 --- a/src/mbgl/style/function.hpp +++ b/src/mbgl/style/function.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_STYLE_FUNCTION -#define MBGL_STYLE_FUNCTION +#pragma once #include #include @@ -27,5 +26,3 @@ private: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/style/function_evaluator.hpp b/src/mbgl/style/function_evaluator.hpp index 7da1c299e..43549179d 100644 --- a/src/mbgl/style/function_evaluator.hpp +++ b/src/mbgl/style/function_evaluator.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_STYLE_FUNCTION_EVALUATOR -#define MBGL_STYLE_FUNCTION_EVALUATOR +#pragma once #include #include @@ -41,5 +40,3 @@ struct Interpolator> } } // namespace mbgl - -#endif diff --git a/src/mbgl/style/layout_property.hpp b/src/mbgl/style/layout_property.hpp index dd3c03215..1df780be5 100644 --- a/src/mbgl/style/layout_property.hpp +++ b/src/mbgl/style/layout_property.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_LAYOUT_PROPERTY -#define MBGL_LAYOUT_PROPERTY +#pragma once #include #include @@ -36,5 +35,3 @@ public: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/style/paint_property.hpp b/src/mbgl/style/paint_property.hpp index 3c2b4ba7d..256f045d0 100644 --- a/src/mbgl/style/paint_property.hpp +++ b/src/mbgl/style/paint_property.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_PAINT_PROPERTY -#define MBGL_PAINT_PROPERTY +#pragma once #include #include @@ -144,5 +143,3 @@ public: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/style/render_item.hpp b/src/mbgl/style/render_item.hpp index 6f1566965..a70c92f62 100644 --- a/src/mbgl/style/render_item.hpp +++ b/src/mbgl/style/render_item.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_STYLE_RENDER_ITEM -#define MBGL_STYLE_RENDER_ITEM +#pragma once namespace mbgl { @@ -20,5 +19,3 @@ struct RenderItem { }; } // namespace mbgl - -#endif diff --git a/src/mbgl/style/style.hpp b/src/mbgl/style/style.hpp index 6a1af4cc9..5fdd6cdc8 100644 --- a/src/mbgl/style/style.hpp +++ b/src/mbgl/style/style.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_STYLE_STYLE -#define MBGL_STYLE_STYLE +#pragma once #include #include @@ -137,5 +136,3 @@ public: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/style/style_bucket_parameters.hpp b/src/mbgl/style/style_bucket_parameters.hpp index ce3fc6ac7..ab63f8fe5 100644 --- a/src/mbgl/style/style_bucket_parameters.hpp +++ b/src/mbgl/style/style_bucket_parameters.hpp @@ -1,5 +1,4 @@ -#ifndef STYLE_BUCKET_PARAMETERS -#define STYLE_BUCKET_PARAMETERS +#pragma once #include #include @@ -60,5 +59,3 @@ public: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/style/style_calculation_parameters.hpp b/src/mbgl/style/style_calculation_parameters.hpp index 00a578d4e..1c50bd612 100644 --- a/src/mbgl/style/style_calculation_parameters.hpp +++ b/src/mbgl/style/style_calculation_parameters.hpp @@ -1,5 +1,4 @@ -#ifndef STYLE_CALCULATION_PARAMETERS -#define STYLE_CALCULATION_PARAMETERS +#pragma once #include #include @@ -27,5 +26,3 @@ public: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/style/style_cascade_parameters.hpp b/src/mbgl/style/style_cascade_parameters.hpp index bacf886b6..569145bd0 100644 --- a/src/mbgl/style/style_cascade_parameters.hpp +++ b/src/mbgl/style/style_cascade_parameters.hpp @@ -1,5 +1,4 @@ -#ifndef STYLE_CASCADE_PARAMETERS -#define STYLE_CASCADE_PARAMETERS +#pragma once #include #include @@ -19,5 +18,3 @@ public: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/style/style_layer.hpp b/src/mbgl/style/style_layer.hpp index a568126e5..1388cbcb5 100644 --- a/src/mbgl/style/style_layer.hpp +++ b/src/mbgl/style/style_layer.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_STYLE_STYLE_LAYER -#define MBGL_STYLE_STYLE_LAYER +#pragma once #include #include @@ -101,5 +100,3 @@ protected: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/style/style_observer.hpp b/src/mbgl/style/style_observer.hpp index c725334c1..9e2c946f7 100644 --- a/src/mbgl/style/style_observer.hpp +++ b/src/mbgl/style/style_observer.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_STYLE_STYLE_OBSERVER -#define MBGL_STYLE_STYLE_OBSERVER +#pragma once #include #include @@ -22,5 +21,3 @@ public: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/style/style_parser.hpp b/src/mbgl/style/style_parser.hpp index 2c1feac15..98481aec5 100644 --- a/src/mbgl/style/style_parser.hpp +++ b/src/mbgl/style/style_parser.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_STYLE_STYLE_PARSER -#define MBGL_STYLE_STYLE_PARSER +#pragma once #include #include @@ -54,5 +53,3 @@ private: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/style/style_render_parameters.hpp b/src/mbgl/style/style_render_parameters.hpp index 16ce99177..7347717a1 100644 --- a/src/mbgl/style/style_render_parameters.hpp +++ b/src/mbgl/style/style_render_parameters.hpp @@ -1,5 +1,4 @@ -#ifndef STYLE_RENDER_PARAMETERS -#define STYLE_RENDER_PARAMETERS +#pragma once namespace mbgl { @@ -14,5 +13,3 @@ public: }; } - -#endif diff --git a/src/mbgl/style/style_update_parameters.hpp b/src/mbgl/style/style_update_parameters.hpp index e620f249f..73ed500e8 100644 --- a/src/mbgl/style/style_update_parameters.hpp +++ b/src/mbgl/style/style_update_parameters.hpp @@ -1,5 +1,4 @@ -#ifndef STYLE_UPDATE_PARAMETERS -#define STYLE_UPDATE_PARAMETERS +#pragma once #include @@ -53,5 +52,3 @@ public: }; } - -#endif diff --git a/src/mbgl/style/zoom_history.hpp b/src/mbgl/style/zoom_history.hpp index 4e01af1fd..8c88ea650 100644 --- a/src/mbgl/style/zoom_history.hpp +++ b/src/mbgl/style/zoom_history.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_STYLE_ZOOM_HISTORY -#define MBGL_STYLE_ZOOM_HISTORY +#pragma once #include @@ -35,5 +34,3 @@ struct ZoomHistory { } }; } // namespace mbgl - -#endif diff --git a/src/mbgl/text/check_max_angle.hpp b/src/mbgl/text/check_max_angle.hpp index 0fb8a715a..5e1ff6f04 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 @@ -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 840b37b94..0fcc083a1 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 #include @@ -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 0be2dabdb..7450fb1b8 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 #include @@ -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 1f76685f9..9a0a5a650 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 #include @@ -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 e4984be86..b5891831d 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 #include @@ -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 37e1b4dbd..08616b268 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 #include @@ -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 7a0c276df..644046d7f 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 #include @@ -9,5 +8,3 @@ namespace mbgl { typedef std::pair GlyphRange; } // end namespace mbgl - -#endif diff --git a/src/mbgl/text/glyph_set.hpp b/src/mbgl/text/glyph_set.hpp index 40f87835f..77e2cb1c9 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 #include @@ -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 240da58b6..d614a4947 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 #include @@ -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 2ed1b2d5d..89650892e 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 #include @@ -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 6680f5244..75345b89e 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 03f86e1df..c68ea2fe6 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 #include @@ -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 89249ee60..ea169b8dc 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 #include @@ -31,5 +30,3 @@ namespace mbgl { PositionedIcon shapeIcon(const SpriteAtlasElement& image, const SymbolLayoutProperties&); } // namespace mbgl - -#endif diff --git a/src/mbgl/tile/geojson_tile.hpp b/src/mbgl/tile/geojson_tile.hpp index 6a490c39a..04ecbc9a2 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 #include @@ -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 d98e1b3b0..347d21e62 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 #include @@ -96,5 +95,3 @@ std::vector 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 af15bba94..46261b2b4 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 #include @@ -35,5 +34,3 @@ private: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/tile/tile.hpp b/src/mbgl/tile/tile.hpp index f66df9c74..1e35e7873 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 #include @@ -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 e63d8cee9..edaa6bd68 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 @@ -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 738b872bf..6552ad0f9 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 #include @@ -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 8c86c0d09..f9afdfa52 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 @@ -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 7cb2536c9..91f3b0480 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 #include @@ -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 d41d4f4f3..aed7b7ee0 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 #include @@ -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 c64d255a0..d7f31bcab 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 #include @@ -70,5 +69,3 @@ private: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/util/assert.hpp b/src/mbgl/util/assert.hpp index 0c2f63f8f..47fc13f94 100644 --- a/src/mbgl/util/assert.hpp +++ b/src/mbgl/util/assert.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_ASSERT -#define MBGL_UTIL_ASSERT +#pragma once #include @@ -9,5 +8,3 @@ ((void)((expr) ? ((void)0) : ((void)fprintf(stderr, "%s:%u: failed assertion `%s'\n", \ __FILE__, __LINE__, #expr), \ abort()))) - -#endif diff --git a/src/mbgl/util/async_task.hpp b/src/mbgl/util/async_task.hpp index ce273c664..69746c3eb 100644 --- a/src/mbgl/util/async_task.hpp +++ b/src/mbgl/util/async_task.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_ASYNC_TASK -#define MBGL_UTIL_ASYNC_TASK +#pragma once #include @@ -23,5 +22,3 @@ private: } // namespace util } // namespace mbgl - -#endif diff --git a/src/mbgl/util/channel.hpp b/src/mbgl/util/channel.hpp index a48156f12..319205b44 100644 --- a/src/mbgl/util/channel.hpp +++ b/src/mbgl/util/channel.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_CHANNEL -#define MBGL_UTIL_CHANNEL +#pragma once #include @@ -35,5 +34,3 @@ private: }; } - -#endif diff --git a/src/mbgl/util/clip_id.hpp b/src/mbgl/util/clip_id.hpp index dd580111c..064a7acf9 100644 --- a/src/mbgl/util/clip_id.hpp +++ b/src/mbgl/util/clip_id.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_CLIP_IDS -#define MBGL_UTIL_CLIP_IDS +#pragma once #include #include @@ -35,5 +34,3 @@ struct ClipID { ::std::ostream& operator<<(::std::ostream& os, const ClipID& rhs); } // namespace mbgl - -#endif diff --git a/src/mbgl/util/clip_lines.hpp b/src/mbgl/util/clip_lines.hpp index a4a5c5fb8..19ab3ac20 100644 --- a/src/mbgl/util/clip_lines.hpp +++ b/src/mbgl/util/clip_lines.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_CLIP_LINES -#define MBGL_UTIL_CLIP_LINES +#pragma once #include #include @@ -15,5 +14,3 @@ GeometryCollection clipLines(const GeometryCollection &lines, } // end namespace util } // end namespace mbgl - -#endif diff --git a/src/mbgl/util/compression.hpp b/src/mbgl/util/compression.hpp index 2e7a8bbc0..8f89a3ac0 100644 --- a/src/mbgl/util/compression.hpp +++ b/src/mbgl/util/compression.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_COMPRESSION -#define MBGL_UTIL_COMPRESSION +#pragma once #include @@ -11,5 +10,3 @@ std::string decompress(const std::string &raw); } // namespace util } // namespace mbgl - -#endif diff --git a/src/mbgl/util/dtoa.hpp b/src/mbgl/util/dtoa.hpp index 00c2c25ce..17614732d 100644 --- a/src/mbgl/util/dtoa.hpp +++ b/src/mbgl/util/dtoa.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_DTOA -#define MBGL_UTIL_DTOA +#pragma once #include @@ -18,5 +17,3 @@ inline std::string dtoa(double value) { } // end namespace util } // end namespace mbgl - -#endif diff --git a/src/mbgl/util/exclusive.hpp b/src/mbgl/util/exclusive.hpp index bb3395996..946604af6 100644 --- a/src/mbgl/util/exclusive.hpp +++ b/src/mbgl/util/exclusive.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_EXCLUSIVE -#define MBGL_UTIL_EXCLUSIVE +#pragma once #include #include @@ -26,5 +25,3 @@ private: } // end namespace util } // end namespace mbgl - -#endif diff --git a/src/mbgl/util/http_header.hpp b/src/mbgl/util/http_header.hpp index b5a640378..8a8335697 100644 --- a/src/mbgl/util/http_header.hpp +++ b/src/mbgl/util/http_header.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_HTTP_HEADER -#define MBGL_UTIL_HTTP_HEADER +#pragma once #include #include @@ -21,5 +20,3 @@ public: } // namespace http } // namespace mbgl - -#endif diff --git a/src/mbgl/util/intersection_tests.hpp b/src/mbgl/util/intersection_tests.hpp index a6e430803..a3ffe65cb 100644 --- a/src/mbgl/util/intersection_tests.hpp +++ b/src/mbgl/util/intersection_tests.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_INTERSECTION_TESTS -#define MBGL_UTIL_INTERSECTION_TESTS +#pragma once #include @@ -12,5 +11,3 @@ bool multiPolygonIntersectsMultiPolygon(const GeometryCollection&, const Geometr } } // namespace mbgl - -#endif diff --git a/src/mbgl/util/io.hpp b/src/mbgl/util/io.hpp index 1bcfe56af..2679eb536 100644 --- a/src/mbgl/util/io.hpp +++ b/src/mbgl/util/io.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_IO -#define MBGL_UTIL_IO +#pragma once #include #include @@ -20,5 +19,3 @@ void deleteFile(const std::string& filename); } // namespace util } // namespace mbgl - -#endif diff --git a/src/mbgl/util/mapbox.hpp b/src/mbgl/util/mapbox.hpp index 56c40df7c..951cbc5a4 100644 --- a/src/mbgl/util/mapbox.hpp +++ b/src/mbgl/util/mapbox.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_MAPBOX -#define MBGL_UTIL_MAPBOX +#pragma once #include #include @@ -24,5 +23,3 @@ extern const uint64_t DEFAULT_OFFLINE_TILE_COUNT_LIMIT; } // namespace mapbox } // namespace util } // namespace mbgl - -#endif diff --git a/src/mbgl/util/mat2.hpp b/src/mbgl/util/mat2.hpp index c89088950..6a25ef0f1 100644 --- a/src/mbgl/util/mat2.hpp +++ b/src/mbgl/util/mat2.hpp @@ -20,8 +20,7 @@ // // 3. This notice may not be removed or altered from any source distribution. -#ifndef MBGL_UTIL_MAT2 -#define MBGL_UTIL_MAT2 +#pragma once #include @@ -37,5 +36,3 @@ void scale(mat2& out, const mat2& a, double v0, double v1); } // namespace matrix } // namespace mbgl - -#endif diff --git a/src/mbgl/util/mat3.hpp b/src/mbgl/util/mat3.hpp index b0ecb1746..ca4955fe5 100644 --- a/src/mbgl/util/mat3.hpp +++ b/src/mbgl/util/mat3.hpp @@ -20,8 +20,7 @@ // // 3. This notice may not be removed or altered from any source distribution. -#ifndef MBGL_UTIL_MAT3 -#define MBGL_UTIL_MAT3 +#pragma once #include @@ -38,5 +37,3 @@ void scale(mat3& out, const mat3& a, double x, double y); } // namespace matrix } // namespace mbgl - -#endif diff --git a/src/mbgl/util/mat4.hpp b/src/mbgl/util/mat4.hpp index 80bd91255..2adeba882 100644 --- a/src/mbgl/util/mat4.hpp +++ b/src/mbgl/util/mat4.hpp @@ -20,8 +20,7 @@ // // 3. This notice may not be removed or altered from any source distribution. -#ifndef MBGL_UTIL_MAT4 -#define MBGL_UTIL_MAT4 +#pragma once #include @@ -48,5 +47,3 @@ void transformMat4(vec4& out, const vec4& a, const mat4& m); } // namespace matrix } // namespace mbgl - -#endif // MBGL_UTIL_MAT4 diff --git a/src/mbgl/util/math.hpp b/src/mbgl/util/math.hpp index f93743f21..ef60f76ff 100644 --- a/src/mbgl/util/math.hpp +++ b/src/mbgl/util/math.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_MATH -#define MBGL_UTIL_MATH +#pragma once #include #include @@ -113,5 +112,3 @@ uint32_t ceil_log2(uint64_t x); } // namespace util } // namespace mbgl - -#endif diff --git a/src/mbgl/util/merge_lines.hpp b/src/mbgl/util/merge_lines.hpp index 55ad79036..b1f216148 100644 --- a/src/mbgl/util/merge_lines.hpp +++ b/src/mbgl/util/merge_lines.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_MERGELINES -#define MBGL_UTIL_MERGELINES +#pragma once #include #include @@ -25,5 +24,3 @@ void mergeLines(std::vector &features); } // end namespace util } // end namespace mbgl - -#endif diff --git a/src/mbgl/util/premultiply.hpp b/src/mbgl/util/premultiply.hpp index f64f3f455..532c7cb11 100644 --- a/src/mbgl/util/premultiply.hpp +++ b/src/mbgl/util/premultiply.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_PREMULTIPLY -#define MBGL_UTIL_PREMULTIPLY +#pragma once #include @@ -11,5 +10,3 @@ UnassociatedImage unpremultiply(PremultipliedImage&&); } // namespace util } // namespace mbgl - -#endif diff --git a/src/mbgl/util/ptr.hpp b/src/mbgl/util/ptr.hpp index 7e8f8ecc1..2dc811818 100644 --- a/src/mbgl/util/ptr.hpp +++ b/src/mbgl/util/ptr.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_PTR -#define MBGL_UTIL_PTR +#pragma once #include #include @@ -25,5 +24,3 @@ public: }; } // namespace util } // namespace mbgl - -#endif \ No newline at end of file diff --git a/src/mbgl/util/rapidjson.hpp b/src/mbgl/util/rapidjson.hpp index c9aad871d..7262e8545 100644 --- a/src/mbgl/util/rapidjson.hpp +++ b/src/mbgl/util/rapidjson.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_RAPIDJSON -#define MBGL_UTIL_RAPIDJSON +#pragma once #include #include @@ -10,5 +9,3 @@ using JSDocument = rapidjson::GenericDocument, rapidjson::CrtA using JSValue = rapidjson::GenericValue, rapidjson::CrtAllocator>; } // namespace mbgl - -#endif diff --git a/src/mbgl/util/raster.hpp b/src/mbgl/util/raster.hpp index 0a275a197..8eef8d6c7 100644 --- a/src/mbgl/util/raster.hpp +++ b/src/mbgl/util/raster.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_RASTER -#define MBGL_UTIL_RASTER +#pragma once #include #include @@ -60,5 +59,3 @@ private: }; } // namespace mbgl - -#endif diff --git a/src/mbgl/util/rect.hpp b/src/mbgl/util/rect.hpp index 1dc8cb8af..2b877db40 100644 --- a/src/mbgl/util/rect.hpp +++ b/src/mbgl/util/rect.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_RECT -#define MBGL_UTIL_RECT +#pragma once namespace mbgl { @@ -23,5 +22,3 @@ struct Rect { inline bool hasArea() const { return w != 0 && h != 0; } }; } // namespace mbgl - -#endif diff --git a/src/mbgl/util/std.hpp b/src/mbgl/util/std.hpp index bab5c1494..974e21329 100644 --- a/src/mbgl/util/std.hpp +++ b/src/mbgl/util/std.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_STD -#define MBGL_UTIL_STD +#pragma once #include #include @@ -26,5 +25,3 @@ void erase_if(Container &container, Predicate pred) { } // namespace util } // namespace mbgl - -#endif diff --git a/src/mbgl/util/stopwatch.hpp b/src/mbgl/util/stopwatch.hpp index a79ad9261..23086b174 100644 --- a/src/mbgl/util/stopwatch.hpp +++ b/src/mbgl/util/stopwatch.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_STOPWATCH -#define MBGL_UTIL_STOPWATCH +#pragma once #include #include @@ -37,5 +36,3 @@ class stopwatch { #endif } // namespace util } // namespace mbgl - -#endif diff --git a/src/mbgl/util/thread.hpp b/src/mbgl/util/thread.hpp index d54d998ab..9efd5ea92 100644 --- a/src/mbgl/util/thread.hpp +++ b/src/mbgl/util/thread.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_THREAD -#define MBGL_UTIL_THREAD +#pragma once #include #include @@ -140,5 +139,3 @@ Thread::~Thread() { } // namespace util } // namespace mbgl - -#endif diff --git a/src/mbgl/util/thread_context.hpp b/src/mbgl/util/thread_context.hpp index 9c00ef25c..60b32b3b2 100644 --- a/src/mbgl/util/thread_context.hpp +++ b/src/mbgl/util/thread_context.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_THREAD_CONTEXT -#define MBGL_UTIL_THREAD_CONTEXT +#pragma once #include @@ -21,5 +20,3 @@ public: } // namespace util } // namespace mbgl - -#endif diff --git a/src/mbgl/util/thread_local.hpp b/src/mbgl/util/thread_local.hpp index 540503735..c3364c5d4 100644 --- a/src/mbgl/util/thread_local.hpp +++ b/src/mbgl/util/thread_local.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_THREAD_LOCAL -#define MBGL_UTIL_THREAD_LOCAL +#pragma once #include @@ -55,5 +54,3 @@ private: } // namespace util } // namespace mbgl - -#endif diff --git a/src/mbgl/util/tile_cover.hpp b/src/mbgl/util/tile_cover.hpp index aab96c843..2d32d8bf4 100644 --- a/src/mbgl/util/tile_cover.hpp +++ b/src/mbgl/util/tile_cover.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_TILE_COVER -#define MBGL_UTIL_TILE_COVER +#pragma once #include #include @@ -21,5 +20,3 @@ std::vector tileCover(const LatLngBounds&, int32_t z); } // namespace util } // namespace mbgl - -#endif diff --git a/src/mbgl/util/token.hpp b/src/mbgl/util/token.hpp index 722b08f77..149661e47 100644 --- a/src/mbgl/util/token.hpp +++ b/src/mbgl/util/token.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_TOKEN -#define MBGL_UTIL_TOKEN +#pragma once #include #include @@ -40,5 +39,3 @@ std::string replaceTokens(const std::string &source, const Lookup &lookup) { } // end namespace util } // end namespace mbgl - -#endif diff --git a/src/mbgl/util/transition.hpp b/src/mbgl/util/transition.hpp index a947a9ad1..8176c6895 100644 --- a/src/mbgl/util/transition.hpp +++ b/src/mbgl/util/transition.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_TRANSITION -#define MBGL_UTIL_TRANSITION +#pragma once #include #include @@ -74,5 +73,3 @@ private: } // namespace util } // namespace mbgl - -#endif diff --git a/src/mbgl/util/url.hpp b/src/mbgl/util/url.hpp index 8baa94be1..b9c66261d 100644 --- a/src/mbgl/util/url.hpp +++ b/src/mbgl/util/url.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_URL -#define MBGL_UTIL_URL +#pragma once #include @@ -12,5 +11,3 @@ std::string percentDecode(const std::string&); } // namespace util } // namespace mbgl - -#endif diff --git a/src/mbgl/util/utf.hpp b/src/mbgl/util/utf.hpp index 286036c09..02aabfc4c 100644 --- a/src/mbgl/util/utf.hpp +++ b/src/mbgl/util/utf.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_UTF -#define MBGL_UTIL_UTF +#pragma once #include @@ -20,5 +19,3 @@ class utf8_to_utf32 { } // namespace mbgl } // namespace util - -#endif diff --git a/src/mbgl/util/variant.hpp b/src/mbgl/util/variant.hpp index cf8e57859..68a1208a1 100644 --- a/src/mbgl/util/variant.hpp +++ b/src/mbgl/util/variant.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_VARIANT -#define MBGL_UTIL_VARIANT +#pragma once #include @@ -9,5 +8,3 @@ template using variant = mapbox::util::variant; } // namespace mbgl - -#endif diff --git a/src/mbgl/util/work_queue.hpp b/src/mbgl/util/work_queue.hpp index 788cfb4d2..3f6328fb5 100644 --- a/src/mbgl/util/work_queue.hpp +++ b/src/mbgl/util/work_queue.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_WORK_QUEUE -#define MBGL_UTIL_WORK_QUEUE +#pragma once #include #include @@ -39,5 +38,3 @@ private: } // namespace util } // namespace mbgl - -#endif diff --git a/src/mbgl/util/worker.hpp b/src/mbgl/util/worker.hpp index ee237b6ae..e07b8b8b4 100644 --- a/src/mbgl/util/worker.hpp +++ b/src/mbgl/util/worker.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_WORKER -#define MBGL_UTIL_WORKER +#pragma once #include #include @@ -61,5 +60,3 @@ private: std::size_t current = 0; }; } // namespace mbgl - -#endif diff --git a/test/algorithm/mock.hpp b/test/algorithm/mock.hpp index 89f51b15b..0faddcac7 100644 --- a/test/algorithm/mock.hpp +++ b/test/algorithm/mock.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_TEST_MOCK -#define MBGL_TEST_MOCK +#pragma once #include #include @@ -56,5 +55,3 @@ MockTileData* MockSource::createTileData(const mbgl::OverscaledTileID& tileID) { // Replace the existing MockTileData object, if any. return (dataTiles[tileID] = std::make_unique()).get(); } - -#endif diff --git a/test/src/mbgl/test/fixture_log_observer.hpp b/test/src/mbgl/test/fixture_log_observer.hpp index f2ccb5cb5..1eabe1009 100644 --- a/test/src/mbgl/test/fixture_log_observer.hpp +++ b/test/src/mbgl/test/fixture_log_observer.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_TEST_FIXTURE_LOG_OBSERVER -#define MBGL_TEST_FIXTURE_LOG_OBSERVER +#pragma once #include @@ -67,5 +66,3 @@ private: using FixtureLogObserver = FixtureLog::Observer; } // namespace mbgl - -#endif diff --git a/test/src/mbgl/test/stub_file_source.hpp b/test/src/mbgl/test/stub_file_source.hpp index 477f72ed4..b88fb5990 100644 --- a/test/src/mbgl/test/stub_file_source.hpp +++ b/test/src/mbgl/test/stub_file_source.hpp @@ -1,5 +1,4 @@ -#ifndef TEST_RESOURCES_STUB_FILE_SOURCE -#define TEST_RESOURCES_STUB_FILE_SOURCE +#pragma once #include #include @@ -40,6 +39,4 @@ private: util::Timer timer; }; -} - -#endif +} // namespace mbgl diff --git a/test/src/mbgl/test/stub_style_observer.hpp b/test/src/mbgl/test/stub_style_observer.hpp index a0d03de8a..45af1edf9 100644 --- a/test/src/mbgl/test/stub_style_observer.hpp +++ b/test/src/mbgl/test/stub_style_observer.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_TEST_STUB_STYLE_OBSERVER -#define MBGL_TEST_STUB_STYLE_OBSERVER +#pragma once #include @@ -64,5 +63,3 @@ public: }; } // namespace mbgl - -#endif diff --git a/test/src/mbgl/test/util.hpp b/test/src/mbgl/test/util.hpp index f778679cb..76c00d843 100644 --- a/test/src/mbgl/test/util.hpp +++ b/test/src/mbgl/test/util.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_TEST_UTIL -#define MBGL_TEST_UTIL +#pragma once #ifdef __APPLE__ #include @@ -76,5 +75,3 @@ void checkImage(const std::string& base, } } - -#endif