diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2016-05-25 21:14:18 +0200 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2016-05-25 21:35:37 +0200 |
commit | e2bcea90fce8a1e05e517c615d21d845e955f53d (patch) | |
tree | 208da7ad0db235a13b5ae6d360279a624e46fb95 /include/mbgl/platform | |
parent | 6368403f433cfbfed1547d4167a9836fa2942a97 (diff) | |
download | qtlocation-mapboxgl-e2bcea90fce8a1e05e517c615d21d845e955f53d.tar.gz |
[core] use #pragma once instead of ifdef include guards
Diffstat (limited to 'include/mbgl/platform')
-rw-r--r-- | include/mbgl/platform/darwin/settings_nsuserdefaults.hpp | 5 | ||||
-rw-r--r-- | include/mbgl/platform/default/glfw_view.hpp | 5 | ||||
-rw-r--r-- | include/mbgl/platform/default/headless_display.hpp | 5 | ||||
-rw-r--r-- | include/mbgl/platform/default/headless_view.hpp | 5 | ||||
-rw-r--r-- | include/mbgl/platform/default/settings_json.hpp | 5 | ||||
-rw-r--r-- | include/mbgl/platform/event.hpp | 5 | ||||
-rw-r--r-- | include/mbgl/platform/log.hpp | 5 | ||||
-rw-r--r-- | include/mbgl/platform/platform.hpp | 5 |
8 files changed, 8 insertions, 32 deletions
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 |