summaryrefslogtreecommitdiff
path: root/include/mbgl/map
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2016-05-25 21:14:18 +0200
committerKonstantin Käfer <mail@kkaefer.com>2016-05-25 21:35:37 +0200
commite2bcea90fce8a1e05e517c615d21d845e955f53d (patch)
tree208da7ad0db235a13b5ae6d360279a624e46fb95 /include/mbgl/map
parent6368403f433cfbfed1547d4167a9836fa2942a97 (diff)
downloadqtlocation-mapboxgl-e2bcea90fce8a1e05e517c615d21d845e955f53d.tar.gz
[core] use #pragma once instead of ifdef include guards
Diffstat (limited to 'include/mbgl/map')
-rw-r--r--include/mbgl/map/camera.hpp5
-rw-r--r--include/mbgl/map/map.hpp5
-rw-r--r--include/mbgl/map/mode.hpp5
-rw-r--r--include/mbgl/map/update.hpp5
-rw-r--r--include/mbgl/map/view.hpp5
5 files changed, 5 insertions, 20 deletions
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