diff options
Diffstat (limited to 'include')
47 files changed, 48 insertions, 189 deletions
diff --git a/include/mbgl/annotation/annotation.hpp b/include/mbgl/annotation/annotation.hpp index 00b2446e40..52916549c9 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 <cstdint> #include <vector> @@ -10,5 +9,3 @@ using AnnotationID = uint32_t; using AnnotationIDs = std::vector<AnnotationID>; } // namespace mbgl - -#endif diff --git a/include/mbgl/annotation/point_annotation.hpp b/include/mbgl/annotation/point_annotation.hpp index 3dea9a3e3e..c9236c3c04 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 <mbgl/util/geo.hpp> @@ -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 4d8d35d9ca..6e3fe95dd4 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 <mbgl/annotation/annotation.hpp> #include <mbgl/style/types.hpp> @@ -53,5 +52,3 @@ private: }; } // namespace mbgl - -#endif diff --git a/include/mbgl/gl/gl.hpp b/include/mbgl/gl/gl.hpp index 5ef76cf1da..6d601d8a23 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 4f3990a434..893c73e0c3 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 b96cfe310e..4204ca8e13 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 <cstdint> #include <tuple> @@ -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 2e20a6386f..4520321655 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 <mbgl/util/geo.hpp> #include <mbgl/util/chrono.hpp> @@ -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 39f0c86959..f074a5ae54 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 <mbgl/util/optional.hpp> #include <mbgl/util/chrono.hpp> @@ -186,5 +185,3 @@ private: }; } // namespace mbgl - -#endif diff --git a/include/mbgl/map/mode.hpp b/include/mbgl/map/mode.hpp index d94cdc0eb5..074bc3f08e 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 <cstdint> @@ -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 4ad1b1d195..3915545bb0 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 <mbgl/util/traits.hpp> @@ -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 c62cc32bfc..4431e2b33c 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 <mbgl/map/change.hpp> #include <mbgl/util/chrono.hpp> @@ -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 90abd4e11e..5cfc9cb45f 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 6364f249dd..b0ca060b85 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 <mbgl/ios/MGLTypes.h> @@ -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 80cf028f79..b5931e6262 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 <mbgl/mbgl.hpp> #include <mbgl/util/run_loop.hpp> @@ -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 80a0c31af3..edcc905221 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 <mbgl/platform/default/headless_view.hpp> @@ -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 9fbbdfd206..d787eb1691 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 <TargetConditionals.h> @@ -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 707d05eb18..eb23b28bc8 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 <mbgl/map/mode.hpp> @@ -23,5 +22,3 @@ public: }; } // namespace mbgl - -#endif diff --git a/include/mbgl/platform/event.hpp b/include/mbgl/platform/event.hpp index 8e36508388..0b3b79df6b 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 <mbgl/util/enum.hpp> @@ -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 cd072c37da..48b9e3dc70 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 <mbgl/platform/event.hpp> @@ -79,5 +78,3 @@ private: }; } // namespace mbgl - -#endif diff --git a/include/mbgl/platform/platform.hpp b/include/mbgl/platform/platform.hpp index de2585874b..59ba7f97f3 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 <memory> #include <string> @@ -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 4c375e58b9..7900b90b66 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 <mbgl/util/noncopyable.hpp> #include <mbgl/util/geo.hpp> @@ -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 76d60fce70..e77befda1b 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 <mbgl/storage/file_source.hpp> #include <mbgl/storage/offline.hpp> @@ -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 e572776af2..88e0336187 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 <mbgl/storage/response.hpp> #include <mbgl/storage/resource.hpp> @@ -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 d5ea13e07e..d7f502a3b2 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 <atomic> #include <mutex> @@ -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 fd742a54c4..081beeeabc 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 <mbgl/storage/file_source.hpp> @@ -24,5 +23,3 @@ private: }; } // namespace mbgl - -#endif diff --git a/include/mbgl/storage/resource.hpp b/include/mbgl/storage/resource.hpp index 01c2ee4e39..62ee549663 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 <mbgl/storage/response.hpp> #include <mbgl/util/optional.hpp> @@ -68,5 +67,3 @@ public: }; } // namespace mbgl - -#endif diff --git a/include/mbgl/storage/response.hpp b/include/mbgl/storage/response.hpp index f140e42b02..83227573cf 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 <mbgl/util/chrono.hpp> #include <mbgl/util/optional.hpp> @@ -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 fa837f11a3..b9a301feea 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 <mbgl/util/chrono.hpp> #include <mbgl/util/optional.hpp> @@ -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 9cad1071c4..9b03ab8a2d 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 <mbgl/util/enum.hpp> @@ -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 81f05d610d..48460d3377 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 <chrono> #include <string> @@ -42,5 +41,3 @@ constexpr std::chrono::duration<Rep, Period> abs(std::chrono::duration<Rep, Peri } // namespace util } // namespace mbgl - -#endif diff --git a/include/mbgl/util/constants.hpp b/include/mbgl/util/constants.hpp index 3517299df2..621fc1820e 100644 --- a/include/mbgl/util/constants.hpp +++ b/include/mbgl/util/constants.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_UTIL_CONSTANTS -#define MBGL_UTIL_CONSTANTS +#pragma once #include <mbgl/util/chrono.hpp> @@ -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 05015ab4c9..eb7e034722 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 <vector> #include <string> @@ -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 5d64ed6718..3fbf313aed 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 <iosfwd> #include <string> @@ -51,5 +50,3 @@ public: } // namespace mbgl -#endif - diff --git a/include/mbgl/util/exception.hpp b/include/mbgl/util/exception.hpp index b2214b36b8..b73a94fcd2 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 <stdexcept> @@ -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 86274c1a7c..7e15d5c2f1 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 <mbgl/math/wrap.hpp> #include <mbgl/util/constants.hpp> @@ -216,5 +215,3 @@ public: }; } // namespace mbgl - -#endif diff --git a/include/mbgl/util/image.hpp b/include/mbgl/util/image.hpp index a1c899d239..fbb0686a7b 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 <string> #include <memory> @@ -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 1789a36de9..105a76a9a0 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 1063ba84a1..a9374a1b53 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 <experimental/optional> @@ -9,5 +8,3 @@ template <typename T> using optional = std::experimental::optional<T>; } // namespace mbgl - -#endif diff --git a/include/mbgl/util/projection.hpp b/include/mbgl/util/projection.hpp index cc1c391962..8e1c994657 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 <mbgl/util/constants.hpp> #include <mbgl/util/geo.hpp> @@ -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 d3a61d4186..9703fe7bcb 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 <mbgl/util/noncopyable.hpp> #include <mbgl/util/util.hpp> @@ -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 5d3631e190..202554c3a7 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 <string> #include <cassert> @@ -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 783241847d..7d76e3b79c 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 <mbgl/util/noncopyable.hpp> #include <mbgl/util/chrono.hpp> @@ -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 812d9fb547..7c9499897e 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 <type_traits> @@ -11,5 +10,3 @@ constexpr auto underlying_type(T t) -> typename std::underlying_type<T>::type { } } // namespace mbgl - -#endif // MBGL_UTIL_TRAITS diff --git a/include/mbgl/util/unitbezier.hpp b/include/mbgl/util/unitbezier.hpp index ce34534d5d..ce3e78f3cc 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 <cmath> @@ -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 2b0fd9cdd5..df8613ab70 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 f24e4b2e9f..5b051fc09f 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 <mbgl/util/async_request.hpp> @@ -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 a874625c81..43f4810b43 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 <mbgl/util/noncopyable.hpp> @@ -17,5 +16,3 @@ public: }; } // namespace mbgl - -#endif |